fix function name

as ingame() is only used to check if there is more than 1 player then it is changed to not look for more than 2 since its not needed. name changed to reflect that.

browser.lua

@@ -1,490 +0,0 @@
-local leaderboard = nil
-local maps
-local mapIndex = 1
-local scrollPos = 1
-local modes = nil
-local mode = 1
-local prefMode = nil
-
--- Imported functions -------
--- lb_common.lua
-local ZoneAct = lb_ZoneAct
-local TicsToTime = lb_TicsToTime
------------------------------
-
-local cv_kartencore
-
-local function mapIndexOffset(n)
-	return (mapIndex + n + #maps - 1) % #maps + 1
-end
-
-local function getMap(offset)
-	return maps[mapIndexOffset(offset or 0)]
-end
-
-local function updateModes()
-	-- set available modes for this map
-	modes = {}
-	for mode, scoreTable in pairs(leaderboard) do
-		if scoreTable[getMap()] then
-			table.insert(modes, mode)
-		end
-	end
-	table.sort(modes)
-
-	mode = 1
-	-- select pref mode
-	for i, m in ipairs(modes) do
-		if m == prefMode then
-			mode = i
-			break
-		end
-	end
-end
-
-local function updateMapIndex(n)
-	mapIndex = mapIndexOffset(n)
-	scrollPos = 1
-
-	updateModes()
-end
-
-local scalar = 2
-local hlfScrnWdth = 320 / 2
-local mappY = 26
-local ttlY = mappY + FixedMul(30, FRACUNIT / scalar)
-local scoresY =  ttlY + 16
-
-local sin = sin
-local function drawMapPatch(v, offset)
-	local scale = FRACUNIT / (abs(offset) + scalar)
-	local mapName = G_BuildMapName(getMap(offset))
-	local patchName = mapName.."P"
-	local mapp = v.patchExists(patchName) and v.cachePatch(patchName) or v.cachePatch("BLANKLVL")
-
-	local scaledWidth = FixedMul(mapp.width, scale)
-	local scaledHeight = FixedMul(mapp.height, scale)
-
-	v.drawScaled(
-		(hlfScrnWdth + offset * scaledWidth - scaledWidth / 2) * FRACUNIT,
-		(mappY - scaledHeight / 2) * FRACUNIT,
-		scale,
-		mapp
-	)
-
-end
-
-local function drawEncore(v)
-	if not cv_kartencore then
-		cv_kartencore = CV_FindVar("kartencore")
-	end
-
-	if not cv_kartencore.value then
-		return
-	end
-
-	local rubyp = v.cachePatch("RUBYICON")
-	local bob = sin(leveltime * ANG10) * 2
-	v.drawScaled(
-		hlfScrnWdth * FRACUNIT,
-		mappY * FRACUNIT + bob,
-		FRACUNIT,
-		rubyp
-	)
-end
-
-local colors = {
-	[0] = 0,
-	[1] = 215
-}
-local function drawMapBorder(v)
-	local mapWidth = FixedMul(160, FRACUNIT / scalar)
-	local mapHeight = FixedMul(100, FRACUNIT / scalar)
-	v.drawFill(
-		hlfScrnWdth - mapWidth / 2 - 1,
-		mappY - mapHeight / 2 -1,
-		mapWidth + 2,
-		mapHeight + 2,
-		colors[leveltime / 4 % 2]
-	)
-end
-
-local function drawMapStrings(v)
-	local map = mapheaderinfo[getMap()]
-	local titleWidth = v.stringWidth(map.lvlttl)
-
-	-- title
-	v.drawString(
-		hlfScrnWdth,
-		ttlY,
-		map.lvlttl,
-		V_SKYMAP,
-		"center"
-	)
-
-	-- zone/act
-	local zone = ZoneAct(map)
-	local zoneWidth = v.stringWidth(zone)
-	v.drawString(
-		hlfScrnWdth + titleWidth / 2,
-		ttlY + 8,
-		zone,
-		V_SKYMAP,
-		"right"
-	)
-
-	-- subtitle
-	v.drawString(
-		hlfScrnWdth + titleWidth / 2 - zoneWidth,
-		ttlY + 8,
-		map.subttl,
-		V_MAGENTAMAP,
-		"small-right"
-	)
-
-	-- hell
-	if map.menuflags & LF2_HIDEINMENU then
-		v.drawString(
-			300,
-			ttlY + 16,
-			"HELL",
-			V_REDMAP,
-			"right"
-		)
-	end
-end
-
-local F_SPBATK = 0x1
-local F_SPBJUS = 0x2
-local F_SPBBIG = 0x4
-local F_SPBEXP = 0x8
-local F_ENCORE = 0x80
-
-local function drawGamemode(v)
-	local m = modes[mode] or 0
-
-	local modeX = 20
-	local modeY = scoresY
-	local scale = FRACUNIT / 2
-
-	if m == 0 then
-		local clockp = v.cachePatch("K_LAPE02")
-		v.drawScaled(
-			modeX * FRACUNIT,
-			modeY * FRACUNIT,
-			scale,
-			clockp
-		)
-
-		v.drawString(
-			modeX,
-			modeY,
-			"Time Attack!"
-		)
-	elseif m & F_SPBATK then
-		local scaledHalf = FixedMul(50 * FRACUNIT, scale) / 2
-		local xoff = 0
-		if m & F_SPBBIG then
-			xoff = $ + scaledHalf
-		end
-		if m & F_SPBEXP then
-			xoff = $ + scaledHalf
-		end
-
-		if m & F_SPBBIG then
-			local growp = v.cachePatch("K_ITGROW")
-			v.drawScaled(
-				modeX * FRACUNIT - scaledHalf + xoff,
-				modeY * FRACUNIT - scaledHalf,
-				scale,
-				growp
-			)
-
-			xoff = $ - scaledHalf
-		end
-
-		if m & F_SPBEXP then
-			local invp = v.cachePatch("K_ITINV"..(leveltime / 3 % 7 + 1))
-			v.drawScaled(
-				modeX * FRACUNIT - scaledHalf + xoff,
-				modeY * FRACUNIT - scaledHalf,
-				scale,
-				invp
-			)
-		end
-
-		local spbp = v.cachePatch("K_ITSPB")
-		v.drawScaled(
-			modeX * FRACUNIT - scaledHalf,
-			modeY * FRACUNIT - scaledHalf,
-			scale,
-			spbp
-		)
-
-		v.drawString(
-			modeX,
-			modeY,
-			"SPB Attack!"
-		)
-	end
-end
-
-local function drawFlags(v, x, y, flags)
-	local nx = x * FRACUNIT
-	local ny = y * FRACUNIT + 2 * FRACUNIT
-	local margin = 4 * FRACUNIT
-	if flags & F_ENCORE then
-		local encp = v.cachePatch("RUBYICON")
-		v.drawScaled(
-			nx,
-			ny + 2 * FRACUNIT,
-			FRACUNIT / 5,
-			encp
-		)
-		nx = $ + margin
-	end
-	if flags & F_SPBATK then
-		local scale = FRACUNIT / 3
-		local shift = 6 * FRACUNIT
-		nx = $ - shift
-		ny = $ - shift
-		if flags & F_SPBJUS then
-			local hyup = v.cachePatch("K_ISHYUD")
-			v.drawScaled(nx, ny, scale, hyup)
-			nx = $ + margin
-		end
-		if flags & F_SPBBIG then
-			local growp = v.cachePatch("K_ISGROW")
-			v.drawScaled(nx - FRACUNIT / 2, ny, scale, growp)
-			nx = $ + margin
-		end
-		if flags & F_SPBEXP then
-			local invp = v.cachePatch("K_ISINV"..(leveltime / 3 % 6 + 1))
-			v.drawScaled(nx, ny, scale, invp)
-			nx = $ + margin
-		end
-	end
-end
-
-local MSK_SPEED = 0xF0
-local MSK_WEIGHT = 0xF
-
-local function drawStats(v, x, y, skin, stats)
-	local s = skins[skin]
-	if stats
-		and not (s
-		and s.kartspeed == (stats & MSK_SPEED) >> 4
-		and s.kartweight == stats & MSK_WEIGHT
-		) then
-		v.drawString(x-2, y-2, (stats & MSK_SPEED) >> 4, V_ALLOWLOWERCASE, "thin")
-		v.drawString(x + 13, y + 9, stats & MSK_WEIGHT, V_ALLOWLOWERCASE, "thin")
-	end
-end
-
--- draw in columns
--- pos, facerank, name, time, flags
--- ______________________________________________
--- | 3|[O]|InsertNameHere     | 01:02:03 | EXB |
--- ----------------------------------------------
--- defined are widths of each column, x value is calculated below
-local column = {
-	[1] = 18,   -- facerank, pos, drawNum is right aligned
-	[2] = 170,  -- name
-	[3] = 60, -- time
-	[4] = 0  -- flags
-}
-do
-	local w = 32 -- starting offset
-	local t
-	for i = 1, #column do
-		t = column[i]
-		column[i] = w
-		w = $ + t
-	end
-end
-
-local colorFlags = {
-	[0] = V_SKYMAP,
-	[1] = 0
-}
-local function drawScore(v, i, pos, score, highlight)
-	local y = scoresY + i * 18
-	local textFlag = colorFlags[pos%2]
-
-	-- position
-	v.drawNum(column[1], y, pos)
-
-	-- facerank
-	local skin = skins[score["skin"]]
-	local facerank = skin and v.cachePatch(skin.facerank) or v.cachePatch("M_NORANK")
-	v.draw(column[1], y, facerank, 0, v.getColormap("sonic", score["color"]))
-
-	-- chili
-	if highlight then
-		local chilip = v.cachePatch("K_CHILI"..leveltime/4%8+1)
-		v.draw(column[1], y, chilip)
-		textFlag = V_YELLOWMAP
-	end
-
-	-- stats
-	drawStats(v, column[1], y, score["skin"], score["stat"])
-	-- name
-	v.drawString(column[2], y, score["name"], V_ALLOWLOWERCASE | textFlag)
-	-- time
-	v.drawString(column[3], y, TicsToTime(score["time"]), textFlag)
-	-- flags
-	drawFlags(v, column[4], y, score["flags"])
-end
-
-local function drawBrowser(v, player)
-	if not leaderboard then return end
-
-	v.fadeScreen(0xFF00, 16)
-
-	-- previous, next maps
-	for i = 5, 1, -1 do
-		drawMapPatch(v, -i)
-		drawMapPatch(v, i)
-	end
-
-	-- draw map border
-	drawMapBorder(v)
-
-	-- current map
-	drawMapPatch(v, 0)
-	drawEncore(v)
-	drawMapStrings(v)
-	drawGamemode(v)
-
-	if not modes then return end
-
-	local gamemode = leaderboard[modes[mode]]
-	if not gamemode then return end
-
-	local scoreTable = gamemode[getMap()]
-	if not scoreTable then return end
-
-	local scores = #scoreTable
-	scrollPos = max(min(scrollPos, scores - 3), 1)
-	local endi = min(scrollPos + 7, scores)
-	for i = scrollPos, endi do
-		drawScore(v, i - scrollPos + 1, i, scoreTable[i], scoreTable[i].name == player.name)
-	end
-end
-rawset(_G, "DrawBrowser", drawBrowser)
-
-local function initBrowser(lb)
-	leaderboard = lb
-
-	-- set mapIndex to current map
-	for i, m in ipairs(maps) do
-		if m == gamemap then
-			mapIndex = i
-			break
-		end
-	end
-
-	scrollPos = 1
-	updateModes()
-end
-rawset(_G, "InitBrowser", initBrowser)
-
--- initialize maps with racemaps only
-local function loadMaps()
-	maps = {}
-	local hell = {}
-	for i = 0, #mapheaderinfo do
-		local map = mapheaderinfo[i]
-		if map and map.typeoflevel & TOL_RACE then
-			if map.menuflags & LF2_HIDEINMENU then
-				table.insert(hell, i)
-			else
-				table.insert(maps, i)
-			end
-		end
-	end
-
-	-- append hell maps
-	for _, map in ipairs(hell) do
-		table.insert(maps, map)
-	end
-end
-addHook("MapLoad", loadMaps)
-
-local repeatCount = 0
-local keyRepeat = 0
-
-local function updateKeyRepeat()
-	S_StartSound(nil, 143)
-	if repeatCount < 1 then
-		keyRepeat = TICRATE / 4
-	else
-		keyRepeat = TICRATE / 15
-	end
-	repeatCount = $ + 1
-end
-
-local function resetKeyRepeat()
-	keyRepeat = 0
-	repeatCount = 0
-end
-
-local ValidButtons = BT_ACCELERATE | BT_BRAKE | BT_FORWARD | BT_BACKWARD | BT_DRIFT | BT_ATTACK
-
--- return value indicates we want to exit the browser
-local function controller(player)
-	keyRepeat = max(0, $ - 1)
-
-	if not (player.cmd.driftturn or player.cmd.buttons) then
-		resetKeyRepeat()
-	end
-
-	local cmd = player.cmd
-	if not keyRepeat then
-		if not (cmd.buttons & ValidButtons or cmd.driftturn) then
-			return
-		end
-
-		updateKeyRepeat()
-
-		if cmd.buttons & BT_BRAKE then
-			S_StartSound(nil, 115)
-			return true
-		elseif cmd.buttons & BT_ACCELERATE then
-			COM_BufInsertText(player, "changelevel "..G_BuildMapName(maps[mapIndex]))
-			return true
-		elseif cmd.buttons & BT_ATTACK then
-			COM_BufInsertText(player, "encore")
-		elseif cmd.driftturn then
-			local dir = cmd.driftturn > 0 and -1 or 1
-
-			if encoremode then
-				updateMapIndex(-dir)
-			else
-				updateMapIndex(dir)
-			end
-		elseif cmd.buttons & BT_FORWARD then
-			scrollPos = $ - 1
-		elseif cmd.buttons & BT_BACKWARD then
-			scrollPos = $ + 1
-		elseif cmd.buttons & BT_DRIFT then
-			scrollPos = 1
-			if modes and #modes then
-				mode = $ % #modes + 1
-				prefMode = modes[mode]
-			end
-		end
-	end
-end
-rawset(_G, "BrowserController", controller)
-
-local function netvars(net)
-	maps = net($)
-	mapIndex = net($)
-	modes = net($)
-	mode = net($)
-	prefMode = net($)
-	scrollPos = net($)
-	leaderboard = net($)
-end
-addHook("NetVars", netvars)

lb_common.lua

@@ -1,26 +0,0 @@
-rawset(_G, "lb_TicsToTime", function(tics, pure)
-	if tics == 0 and pure then
-		return "-:--:--"
-	end
-
-	return string.format(
-		"%d:%02d:%02d",
-		G_TicsToMinutes(tics, true),
-		G_TicsToSeconds(tics),
-		G_TicsToCentiseconds(tics)
-	)
-end)
-
-rawset(_G, "lb_ZoneAct", function(map)
-	local z = ""
-	if map.zonttl != "" then
-		z = " " + map.zonttl
-	elseif not(map.levelflags & LF_NOZONE) then
-		z = " Zone"
-	end
-	if map.actnum != "" then
-		z = $ + " " + map.actnum
-	end
-
-	return z
-end)

leaderboard.lua

@@ -12,28 +12,14 @@ local splits = {}
 local PATCH = nil
 local help = true
 local EncoreInitial = nil
+local cv_teamchange
 local scoreTable
 
-
--- Text flash on finish
-local FlashTics = 0
-local FlashRate
-local FlashVFlags
-local YellowFlash = {
-	[0] = V_YELLOWMAP,
-	[1] = V_ORANGEMAP,
-	[2] = 0
-}
-local RedFlash = {
-	[0] = V_REDMAP,
-	[1] = 0
-}
-
 -- Tracks if stats have been written or not
 local StatTrack = false
 
 local UNCLAIMED = "Unclaimed Record"
-local HELP_MESSAGE = "\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui rival scroll encore records levelselect"
+local HELP_MESSAGE = "\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui rival scroll encore"
 local FILENAME = "leaderboard.txt"
 
 -- Retry / changelevel map
@@ -55,7 +41,6 @@ local clearcheats = false
 
 local START_TIME = 6 * TICRATE + (3 * TICRATE / 4) + 1
 local AFK_TIMEOUT = TICRATE * 5
-local AFK_BROWSER = TICRATE * 15
 local AFK_BALANCE = TICRATE * 60
 local AFK_BALANCE_WARN = AFK_BALANCE - TICRATE * 10
 local PREVENT_JOIN_TIME = START_TIME + TICRATE * 5
@@ -69,7 +54,6 @@ local DS_DEFAULT = 0x0
 local DS_SCROLL  = 0x1
 local DS_AUTO    = 0x2
 local DS_SCRLTO  = 0x4
-local DS_BROWSER = 0x8
 
 local drawState = DS_DEFAULT
 
@@ -87,27 +71,14 @@ local clamp
 
 local scroll_to
 
+local ticsToTime
+
 local allowJoin
-
--- Imported functions --
-
--- lb_common.lua
-local ticsToTime = lb_TicsToTime
-local zoneAct = lb_ZoneAct
-
--- browser.lua
-local InitBrowser = InitBrowser
-local DrawBrowser = DrawBrowser
-local BrowserController = BrowserController
 ---------------
 
--- cvars
-local cv_teamchange
-local cv_spbatk
-
 local cv_gui = CV_RegisterVar({
 	name = "lb_gui",
-	defaultvalue = GUI_ON,
+	defaultvalue = "On",
 	flags = 0,
 	PossibleValue = {Off = GUI_OFF, Splits = GUI_SPLITS, On = GUI_ON}
 })
@@ -115,7 +86,7 @@ local cv_gui = CV_RegisterVar({
 local AntiAFK = true
 CV_RegisterVar({
 	name = "lb_afk",
-	defaultvalue = 1,
+	defaultvalue = "On",
 	flags = CV_NETVAR | CV_CALL,
 	PossibleValue = CV_OnOff,
 	func = function(v)
@@ -134,7 +105,7 @@ CV_RegisterVar({
 
 local cv_enable = CV_RegisterVar({
 	name = "lb_enable",
-	defaultvalue = 1,
+	defaultvalue = "On",
 	flags = CV_NETVAR | CV_CALL,
 	PossibleValue = CV_OnOff,
 	func = function(v)
@@ -154,7 +125,7 @@ local cv_saves = CV_RegisterVar({
 
 local cv_interrupt = CV_RegisterVar({
 	name = "lb_interrupt",
-	defaultvalue = 0,
+	defaultvalue = "Off",
 	flags = CV_NETVAR | CV_CALL,
 	PossibleValue = CV_OnOff,
 	func = function(v)
@@ -222,21 +193,17 @@ end
 
 local cv_spb_separate = CV_RegisterVar({
 	name = "lb_spb_combined",
-	defaultvalue = 1,
+	defaultvalue = "On",
-	flags = CV_NETVAR | CV_CALL | CV_NOINIT,
+	flags = CV_NETVAR | CV_CALL,
 	PossibleValue = CV_YesNo,
 	func = function(v)
-		local curSep = ST_SEP
-
 		if v.value then
 			ST_SEP = F_SPBATK
 		else
 			ST_SEP = F_SPBATK | F_SPBBIG | F_SPBEXP
 		end
 
-		if curSep != ST_SEP then
+		reinit_lb()
-			reinit_lb()
-		end
 	end
 })
 
@@ -253,36 +220,24 @@ local function score_t(map, name, skin, color, time, splits, flags, stat)
 	}
 end
 
-local MSK_SPEED = 0xF0
-local MSK_WEIGHT = 0xF
-
 local function stat_t(speed, weight)
 	if speed and weight then
-		return (speed << 4) | weight
+		return {
+			["speed"] = speed,
+			["weight"] = weight
+		}
 	end
-	return 0
+	return nil
 end
 
 local function stat_str(stat)
 	if stat then
-		return string.format("%d%d", (stat & MSK_SPEED) >> 4, stat & MSK_WEIGHT)
+		return string.format("%d%d", stat["speed"], stat["weight"])
 	end
 
 	return "0"
 end
 
-local function splits_from_str(splitstr)
-	local spl = {}
-	for str in splitstr:gmatch("([^ ]+)") do
-		table.insert(spl, tonumber(str))
-	end
-	return spl
-end
-
-local function splits_to_str(splits)
-	return table.concat(splits, " ")
-end
-
 -- Read the leaderboard
 local f = io.open(FILENAME, "r")
 if f then
@@ -301,7 +256,12 @@ if f then
 
 		scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
 
-		local spl = t[6] or ""
+		local spl = {}
+		if t[6] != nil then
+			for str in t[6]:gmatch("([^ ]+)") do
+				table.insert(spl, tonumber(str))
+			end
+		end
 
 		local stats = nil
 		if t[8] != nil then
@@ -337,40 +297,39 @@ end
 
 function allowJoin(v)
 	if not cv_interrupt.value then
-		local y
 		if v then
-			y = "yes"
+			COM_BufInsertText(server, "allowteamchange Yes")
 			hud.enable("freeplay")
 		else
-			y = "no"
+			COM_BufInsertText(server, "allowteamchange No")
 			hud.disable("freeplay")
 		end
-
-		COM_BufInsertText(server, "allowteamchange " + y)
 	end
 end
 
--- Returns true if there is a single player ingame
+local function TwoPlusInGame()
-local function singleplayer()
 	local n = 0
 	for p in players.iterate do
 		if p.valid and not p.spectator then
 			n = $ + 1
-			if n > 1 then
+			if n == 2 then
-				return false
+				return true
 			end
 		end
 	end
-	return true
+	return false
 end
 
 local function initLeaderboard(player)
-	if disable and leveltime < START_TIME then
+	if cv_enable.value and G_RaceGametype() then
-		disable = not singleplayer()
+		if disable and leveltime < START_TIME then
+			disable = TwoPlusInGame()
+		else
+			disable = $ or TwoPlusInGame()
+		end
 	else
-		disable = disable or not singleplayer()
+		disable = true
 	end
-	disable = $ or not cv_enable.value or not (maptol & (TOL_SP | TOL_RACE))
 
 	-- Restore encore mode to initial value
 	if disable and EncoreInitial != nil then
@@ -383,7 +342,7 @@ end
 addHook("PlayerSpawn", initLeaderboard)
 
 local function doyoudare(player)
-	if not singleplayer() or player.spectator then
+	if TwoPlusInGame() or player.spectator then
 		CONS_Printf(player, "How dare you")
 		return false
 	end
@@ -392,12 +351,6 @@ end
 
 local function retry(player, ...)
 	if doyoudare(player) then
-		-- Verify valid race level
-		if not (mapheaderinfo[gamemap].typeoflevel & (TOL_SP | TOL_RACE)) then
-			CONS_Printf(player, "Battle maps are not supported")
-			return
-		end
-
 		-- Prevents bind crash
 		if leveltime < 20 then
 			return
@@ -414,65 +367,26 @@ local function exitlevel(player, ...)
 end
 COM_AddCommand("exit", exitlevel)
 
-local function initBrowser(player)
-	if not doyoudare(player) then return end
-
-	-- TODO: allow in battle
-	if mapheaderinfo[gamemap].typeoflevel & TOL_MATCH then
-		CONS_Printf(player, "Please exit battle first")
-		return
-	end
-
-	if not InitBrowser then
-		print("Browser is not loaded")
-		return
-	end
-
-	InitBrowser(lb)
-	drawState = DS_BROWSER
-
-	player.afkTime = leveltime
-end
-COM_AddCommand("levelselect", initBrowser)
-
 local function findMap(player, ...)
 	local search = ...
+	if search == nil then 
 
-	local hell = "\x85HELL"
+		return
-	local tol = {
+	end
-		[TOL_SP] = "\x81Race\x80", -- Nuked race maps
-		[TOL_COOP] = "\x8D\Battle\x80", -- Nuked battle maps
-		[TOL_RACE] = "\x88Race\x80",
-		[TOL_MATCH] = "\x87\Battle\x80"
-	}
-	local lvltype, map, lvlttl
 
 	for i = 1, #mapheaderinfo do
-		map = mapheaderinfo[i]
+		local map = mapheaderinfo[i]
 		if map == nil then
 			continue
 		end
 
-		lvlttl = map.lvlttl + zoneAct(map)
+		if map.lvlttl:lower():find(search:lower()) then
-
-		if not search or lvlttl:lower():find(search:lower()) then
-			-- Only care for up to TOL_MATCH (0x10)
-			lvltype = tol[map.typeoflevel & 0x1F] or map.typeoflevel
-
-			-- If not battle print numlaps
-			lvltype = (map.typeoflevel & (TOL_MATCH | TOL_COOP) and lvltype)
-				or string.format("%s \x82%-2d\x80", lvltype, map.numlaps)
-
-
 			CONS_Printf(
 				player,
 				string.format(
-					"%s %-9s %-30s - %s\t%s",
+					"%s - %s",
 					G_BuildMapName(i),
-					lvltype,
+					map.lvlttl
-					lvlttl,
-					map.subttl,
-					(map.menuflags & LF2_HIDEINMENU and hell) or ""
 				)
 			)
 		end
@@ -480,128 +394,11 @@ local function findMap(player, ...)
 end
 COM_AddCommand("findmap", findMap)
 
-local function mapnumFromExtended(map)
+local function mapNotExists(player, map)
-	local p, q = map:upper():match("MAP(%w)(%w)$", 1)
+	CONS_Printf(player, string.format("Map doesn't exist: %s", map:upper()))
-	if not (p and q) then
-		return nil
-	end
-
-	local mapnum = 0
-	local A = string.byte("A")
-
-	if tonumber(p) != nil then
-		-- Non extended map numbers
-		if tonumber(q) == nil then
-			return nil
-		end
-		mapnum = tonumber(p) * 10 + tonumber(q)
-	else
-		--Extended map numbers
-		p = string.byte(p) - A
-		local qn = tonumber(q)
-		if qn == nil then
-			qn = string.byte(q) - A + 10
-		end
-
-		mapnum = 36 * p + qn + 100
-	end
-
-	return mapnum
 end
 
-local SPBModeSym = {
+local ALPH = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	[F_SPBEXP] = "X",
-	[F_SPBBIG] = "B",
-	[F_SPBJUS] = "J",
-}
-
-local function modeToString(mode)
-	local modestr = "Time Attack"
-	if mode & F_SPBATK then
-		modestr = "SPB"
-		for k, v in pairs(SPBModeSym) do
-			if mode & k then
-				modestr = $ + v
-			end
-		end
-	end
-
-	return modestr
-end
-
-local function records(player, ...)
-	local mapid = ...
-	local mapnum = gamemap
-
-	if mapid then
-		mapnum = mapnumFromExtended(mapid)
-		if not mapnum then
-			CONS_Printf(player, string.format("Invalid map name: %s", mapid))
-			return
-		end
-	end
-
-	local map = mapheaderinfo[mapnum]
-	if map then
-		CONS_Printf(player,
-			string.format(
-				"\x83%s%8s",
-				map.lvlttl,
-				(map.menuflags & LF2_HIDEINMENU and "\x85HELL") or ""
-			)
-		)
-
-		local zoneact = zoneAct(map)
-		-- print the zone/act on the right hand size under the title
-		CONS_Printf(
-			player,
-			string.format(
-				string.format("\x83%%%ds%%s\x80 - \x88%%s", #map.lvlttl - #zoneact / 2 - 1),
-				" ",
-				zoneAct(map),
-				map.subttl
-			)
-		)
-	else
-		CONS_Printf(player, "\x85UNKNOWN MAP")
-	end
-
-	for mode, maps in pairs(lb) do
-		local maptbl = maps[mapnum]
-		if not maptbl then continue end
-		CONS_Printf(player, "")
-		CONS_Printf(player, modeToString(mode))
-
-		-- don't print flags for time attack
-		if mode then
-			for i, tbl in ipairs(maptbl) do
-				CONS_Printf(
-					player,
-					string.format(
-						"%2d %-21s \x89%8s \x80%s",
-						i,
-						tbl["name"],
-						ticsToTime(tbl["time"]),
-						modeToString(tbl["flags"])
-					)
-				)
-			end
-		else
-			for i, tbl in ipairs(maptbl) do
-				CONS_Printf(
-					player,
-					string.format(
-						"%2d %-21s \x89%8s",
-						i,
-						tbl["name"],
-						ticsToTime(tbl["time"])
-					)
-				)
-			end
-		end
-	end
-end
-COM_AddCommand("records", records)
 
 local function changelevel(player, ...)
 	if not doyoudare(player) then
@@ -617,19 +414,32 @@ local function changelevel(player, ...)
 		return
 	end
 
-	local mapnum = mapnumFromExtended(map)
+	local p, q = map:upper():match("MAP(%w)(%w)$", 1)
-	if not mapnum then
+	if not (p and q) then
 		CONS_Printf(player, string.format("Invalid map name: %s", map))
-	end
-
-	if mapheaderinfo[mapnum] == nil then
-		CONS_Printf(player, string.format("Map doesn't exist: %s", map:upper()))
 		return
 	end
 
-	-- Verify valid race level
+	local mapnum = 0
-	if not (mapheaderinfo[mapnum].typeoflevel & (TOL_SP | TOL_RACE)) then
+	if tonumber(p) != nil then
-		CONS_Printf(player, "Battle maps are not supported")
+		-- Non extended map numbers
+		if tonumber(q) == nil then
+			mapNotExists(player, map)
+			return
+		end
+		mapnum = tonumber(p) * 10 + tonumber(q)
+	else
+		--Extended map numbers
+		p = ALPH:find(p) - 1
+		local qn = tonumber(q)
+		if qn == nil then
+			qn = ALPH:find(q) + 9
+		end
+		mapnum = 36 * p + qn + 100
+	end
+	
+	if mapheaderinfo[mapnum] == nil then
+		mapNotExists(player, map)
 		return
 	end
 
@@ -688,7 +498,7 @@ local function findRival(player, ...)
 		[0] = "\x89",
 		[-1] = "\x88"
 	}
-
+	
 	local sym = {
 		[true] = "-",
 		[false] = "",
@@ -746,6 +556,12 @@ local function findRival(player, ...)
 		return a["rival"]["map"] < b["rival"]["map"]
 	end
 
+	local modestrings = {
+		[F_SPBEXP] = "X",
+		[F_SPBBIG] = "B",
+		[F_SPBJUS] = "J",
+	}
+
 	for mode, tbl in pairs(scores) do
 		if i >= stop then break end
 
@@ -759,7 +575,15 @@ local function findRival(player, ...)
 			if i >= stop then break end
 			i = i + 1
 
-			local modestr = modeToString(score["rival"]["flags"])
+			local modestr = "TA"
+			if score["rival"]["flags"] & F_SPBATK then
+				modestr = "SPB"
+				for k, v in pairs(modestrings) do
+					if score["rival"]["flags"] & k then
+						modestr = $ + v
+					end
+				end
+			end
 
 			if score["your"] then
 				local diff = score["your"]["time"] - score["rival"]["time"]
@@ -828,7 +652,7 @@ COM_AddCommand("rival", findRival)
 --			--		v[i]["flags"],
 --			--		","
 --			--	)
---			--
+--			--		
 --			--end
 --		end
 --	end
@@ -841,13 +665,25 @@ addHook("MapLoad", function()
 		drawState = DS_DEFAULT
 		scrollY = 50 * FRACUNIT
 		scrollAcc = 0
-		FlashTics = 0
 
 		allowJoin(true)
 		--printTable(lb)
 	end
 )
 
+function ticsToTime(tics, pure)
+	if tics == 0 and pure then
+		return "-:--:--"
+	end
+
+	return string.format(
+		"%d:%02d:%02d",
+		G_TicsToMinutes(tics, true),
+		G_TicsToSeconds(tics),
+		G_TicsToCentiseconds(tics)
+	)
+end
+
 -- Item patches have the amazing property of being displaced 12x 13y pixels
 local iXoffset = 13 * FRACUNIT
 local iYoffset = 12 * FRACUNIT
@@ -870,7 +706,7 @@ local modePatches = {
 
 local function modePatch(flag)
 	if flag == F_SPBEXP then
-		return PATCH[modePatches[flag]][(leveltime / 3) % 6]
+		return PATCH[modePatches[flag]][(leveltime / 4) % 6]
 	end
 	return PATCH[modePatches[flag]]
 end
@@ -883,7 +719,7 @@ local function marquee(text, maxwidth)
 	if #text <= maxwidth then
 		return text
 	end
-
+	
 	local shift = 16
 
 	-- Creates an index range ranging from -shift to #text + shift
@@ -921,11 +757,10 @@ local FACERANK_DIM = 16
 local FACERANK_SPC = FACERANK_DIM + 4
 local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, textVFlags)
 	textVFlags = textVFlags or V_HUDTRANSHALF
-	local me = player.name == score["name"]
 
 	--draw Patch/chili
 	v.draw(x, y, faceRank, V_HUDTRANS | VFLAGS, v.getColormap("sonic", score["color"]))
-	if me then
+	if player.name == score["name"] then
 		v.draw(x, y, PATCH["CHILI"][(leveltime / 4) % 8], V_HUDTRANS | VFLAGS)
 	end
 
@@ -937,7 +772,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 			bob + (y + FACERANK_DIM / 2) * FRACUNIT,
 			FRACUNIT / 6,
 			PATCH["RUBY"],
-			V_HUDTRANS | VFLAGS
+			V_HUDTRANS
 		)
 	end
 
@@ -994,11 +829,11 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 	local pskin = score["skin"] and skins[score["skin"]]
 	if stat and not (
 			pskin
-			and pskin.kartweight == stat & MSK_WEIGHT
+			and pskin.kartweight == stat["weight"]
-			and pskin.kartspeed == (stat & MSK_SPEED) >> 4
+			and pskin.kartspeed == stat["speed"]
 		) then
-		v.drawString(x + FACERANK_DIM - 2, y + 4, (stat & MSK_SPEED) >> 4, V_HUDTRANS | VFLAGS, "small")
+		v.drawString(x + FACERANK_DIM - 2, y + 4, stat["speed"], V_HUDTRANS | VFLAGS, "small")
-		v.drawString(x + FACERANK_DIM - 2, y + 8, stat & MSK_WEIGHT, V_HUDTRANS | VFLAGS, "small")
+		v.drawString(x + FACERANK_DIM - 2, y + 8, stat["weight"], V_HUDTRANS | VFLAGS, "small")
 	end
 
 	if gui == GUI_ON or (gui == GUI_SPLITS and showSplit) then
@@ -1021,23 +856,17 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 			end
 		end
 
-		local flashV = 0
-		if me and FlashTics > leveltime then
-			flashV = FlashVFlags[leveltime / FlashRate % (#FlashVFlags + 1)]
-		end
-
 		v.drawString(
 			x + FACERANK_DIM + px,
 			y + py,
 			name,
-			textVFlags | V_ALLOWLOWERCASE | VFLAGS | flashV,
+			textVFlags | V_ALLOWLOWERCASE | VFLAGS,
 			stralign
 		)
 
 		-- Draw splits
-		local splts = splits_from_str(score["splits"])
+		if showSplit and score["splits"] and score["splits"][prevLap] != nil then
-		if showSplit and splts and splts[prevLap] != nil then
+			local split = splits[prevLap] - score["splits"][prevLap]
-			local split = splits[prevLap] - splts[prevLap]
 			v.drawString(
 				x + px + FACERANK_DIM,
 				y + 8,
@@ -1049,7 +878,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 				x + px + FACERANK_DIM,
 				y + 8,
 				ticsToTime(score["time"], true),
-				textVFlags | bodium[min(pos, 4)] | VFLAGS | flashV
+				textVFlags | bodium[min(pos, 4)] | VFLAGS
 			)
 		end
 	end
@@ -1129,16 +958,11 @@ local function drawScrollTo(v, player, scoreTable, gui)
 	drawScroll(v, player, scoreTable, gui)
 end
 
-local function drawBrowser(v, player)
-	DrawBrowser(v, player)
-end
-
 local stateFunctions = {
 	[DS_DEFAULT] = drawDefault,
 	[DS_SCROLL] = drawScroll,
 	[DS_AUTO] = drawAuto,
-	[DS_SCRLTO] = drawScrollTo,
+	[DS_SCRLTO] = drawScrollTo
-	[DS_BROWSER] = drawBrowser
 }
 
 -- Draw mode and return pos + 1 if success
@@ -1229,45 +1053,9 @@ local function writeStats()
 	end
 end
 
-local function checkFlags(p)
-	local flags = 0
-
-	-- Encore
-	if encoremode then
-		flags = $ | F_ENCORE
-	end
-
-	if not cv_spbatk then
-		cv_spbatk = CV_FindVar("spbatk")
-	end
-
-	-- SPBAttack
-	if server.SPBArunning and cv_spbatk.value then
-		flags = $ | F_SPBATK
-
-		if server.SPBAexpert then
-			flags = $ | F_SPBEXP
-		end
-		if p.SPBAKARTBIG then
-			flags = $ | F_SPBBIG
-		end
-		if p.SPBAjustice then
-			flags = $ | F_SPBJUS
-		end
-	end
-
-	return flags
-end
-
 local function saveTime(player)
-	-- Disqualify if the flags changed mid trial.
-	if checkFlags(player) != Flags then
-		print("Game mode change detected! Time has been disqualified.")
-		S_StartSound(nil, 110)
-		return
-	end
 
-	scoreTable = $ or {}
+	scoreTable =  $ or {}
 
 	local pskin = skins[player.mo.skin]
 	local newscore = score_t(
@@ -1276,7 +1064,7 @@ local function saveTime(player)
 		player.mo.skin,
 		player.skincolor,
 		timeFinished,
-		splits_to_str(splits),
+		splits,
 		Flags,
 		stat_t(player.HMRs or pskin.kartspeed, player.HMRw or pskin.kartweight)
 	)
@@ -1287,16 +1075,10 @@ local function saveTime(player)
 			if lbComp(newscore, scoreTable[i]) then
 				table.remove(scoreTable, i)
 				S_StartSound(nil, 130)
-				FlashTics = leveltime + TICRATE * 3
-				FlashRate = 1
-				FlashVFlags = YellowFlash
 				break
 			else
 				-- You suck lol
 				S_StartSound(nil, 201)
-				FlashTics = leveltime + TICRATE * 3
-				FlashRate = 3
-				FlashVFlags = RedFlash
 				scroll_to(player)
 				return
 			end
@@ -1338,7 +1120,7 @@ local function saveTime(player)
 					score["skin"], "\t",
 					score["color"], "\t",
 					score["time"], "\t",
-					score["splits"], "\t",
+					table.concat(score["splits"], " "), "\t",
 					score["flags"], "\t",
 					stat_str(score["stat"]), "\n"
 				)
@@ -1373,20 +1155,18 @@ local function getGamer()
 	end
 end
 
-local function changeMap()
-	COM_BufInsertText(server, "map " + nextMap + " -force -gametype race")
-	nextMap = nil
-end
-
 local function think()
-	if nextMap then changeMap() end
+	if nextMap then
+		COM_BufInsertText(server, "map " + nextMap)
+		nextMap = nil
+	end
 
 	if disable then
 		if AntiAFK then
-			if not singleplayer() then
+			if TwoPlusInGame() then
 				for p in players.iterate do
 					if p.valid and not p.spectator and not p.exiting and p.lives > 0 then
-						if p.cmd.buttons or p.cmd.driftturn then
+						if p.cmd.buttons then
 							p.afkTime = leveltime
 						end
 
@@ -1420,7 +1200,7 @@ local function think()
 	if leveltime < START_TIME then
 		-- Help message
 		if leveltime == START_TIME - TICRATE * 3 then
-			if singleplayer()  then
+			if p then
 				if help then
 					help = false
 					chatprint(HELP_MESSAGE, true)
@@ -1431,7 +1211,13 @@ local function think()
 		end
 
 		-- Autospec
+		-- Encore
 		if leveltime == 1 then
+			Flags = $ & !F_ENCORE
+			if encoremode then
+				Flags = $ | F_ENCORE
+			end
+
 			if p then
 				for s in players.iterate do
 					if s.valid and s.spectator then
@@ -1440,27 +1226,34 @@ local function think()
 				end
 			end
 		end
-
+		
-		if leveltime > START_TIME - (3 * TICRATE) / 2 then
+		-- Gamemode flags
+		Flags = $ & !(F_SPBATK | F_SPBEXP | F_SPBBIG | F_SPBJUS)
+		if leveltime > START_TIME - (3 * TICRATE) / 2 and server.SPBArunning then
+			Flags = $ | F_SPBATK
+			if server.SPBAexpert then
+				Flags = $ | F_SPBEXP
+			end
 			if clearcheats then
 				clearcheats = false
-				if p then
+				for q in players.iterate do
-					p.SPBAKARTBIG = false
+					q.SPBAKARTBIG = false
-					p.SPBAjustice = false
+					q.SPBAjustice = false
-					p.SPBAshutup = false
+					q.SPBAshutup = false
 				end
 			end
 
-			Flags = checkFlags(p)
+			if p then
-
+				if p.SPBAKARTBIG then
-			-- make sure the spb actually spawned
+					Flags = $ | F_SPBBIG
-			if server.SPBArunning and leveltime == START_TIME - 1 then
+				end
-				if not (server.SPBAbomb and server.SPBAbomb.valid) then
+				if p.SPBAjustice then
-					-- it didn't spawn, clear spb flags
+					Flags = $ | F_SPBJUS
-					Flags = $ & !(F_SPBATK | F_SPBEXP | F_SPBBIG | F_SPBJUS)
 				end
 			end
-		else
+
+		end
+		if not (Flags & F_SPBATK) then
 			hud.enable("freeplay")
 		end
 	end
@@ -1472,12 +1265,6 @@ local function think()
 	end
 
 	if p then
-		-- must be done before browser control
-		if p.laps >= mapheaderinfo[gamemap].numlaps and timeFinished == 0 then
-			timeFinished = p.realtime
-			saveTime(p)
-		end
-
 		-- Scroll controller
 		-- Spectators can't input buttons so let the gamer do it
 		if drawState == DS_SCROLL then
@@ -1491,33 +1278,13 @@ local function think()
 					scrollAcc = 0
 				end
 			end
-		elseif drawState == DS_BROWSER then
+		end
-			if BrowserController(p) then
-				drawState = DS_DEFAULT
-			end
 
-			-- prevent intermission while browsing
+		if p.lives == 0 then
-			if p.exiting then
-				p.exiting = $ + 1
-			end
-
-			-- disable spba hud
-			if server.SPBArunning and server.SPBAdone then
-				server.SPBArunning = false
-				p.pflags = $ & !(PF_TIMEOVER)
-				p.exiting = 100
-			end
-
-			-- prevent softlocking the server
-			if p.afkTime + AFK_BROWSER < leveltime then
-				drawState = DS_DEFAULT
-				S_StartSound(nil, 100)
-			end
-		elseif p.lives == 0 then
 			drawState = DS_SCROLL
 		end
 
-		if p.cmd.buttons or p.cmd.driftturn then
+		if p.cmd.buttons then
 			p.afkTime = leveltime
 		end
 
@@ -1533,6 +1300,10 @@ local function think()
 			end
 		end
 
+		if p.laps >= mapheaderinfo[gamemap].numlaps and timeFinished == 0 then
+			timeFinished = p.realtime
+			saveTime(p)
+		end
 		regLap(p)
 	elseif cv_teamchange.value == 0 then
 		allowJoin(true)
@@ -1541,7 +1312,10 @@ end
 addHook("ThinkFrame", think)
 
 local function interThink()
-	if nextMap then changeMap() end
+	if nextMap then
+		COM_BufInsertText(server, "map " + nextMap)
+		nextMap = nil
+	end
 
 	if not cv_teamchange then
 		cv_teamchange = CV_FindVar("allowteamchange")