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.

leaderboard.lua

@@ -12,6 +12,8 @@ local splits = {}
 local PATCH = nil
 local help = true
 local EncoreInitial = nil
+local cv_teamchange
+local scoreTable
 
 -- Tracks if stats have been written or not
 local StatTrack = false
@@ -76,21 +78,34 @@ local allowJoin
 
 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}
 })
 
-local cv_afk = CV_RegisterVar({
+local AntiAFK = true
+CV_RegisterVar({
 	name = "lb_afk",
-	defaultvalue = 1,
+	defaultvalue = "On",
-	flags = CV_NETVAR,
+	flags = CV_NETVAR | CV_CALL,
-	PossibleValue = CV_OnOff
+	PossibleValue = CV_OnOff,
+	func = function(v)
+		-- Set players afkTime and toggle AntiAFK
+		if v.value then
+			for p in players.iterate do
+				p.afkTime = leveltime
+			end
+
+			AntiAFK = true
+		else
+			AntiAFK = false
+		end
+	end
 })
 
 local cv_enable = CV_RegisterVar({
 	name = "lb_enable",
-	defaultvalue = 1,
+	defaultvalue = "On",
 	flags = CV_NETVAR | CV_CALL,
 	PossibleValue = CV_OnOff,
 	func = function(v)
@@ -110,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)
@@ -178,7 +193,7 @@ end
 
 local cv_spb_separate = CV_RegisterVar({
 	name = "lb_spb_combined",
-	defaultvalue = 1,
+	defaultvalue = "On",
 	flags = CV_NETVAR | CV_CALL,
 	PossibleValue = CV_YesNo,
 	func = function(v)
@@ -239,7 +254,7 @@ if f then
 			flags = tonumber(t[7])
 		end
 
-		local scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
+		scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
 
 		local spl = {}
 		if t[6] != nil then
@@ -282,36 +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
 
-local function ingame()
+local function TwoPlusInGame()
 	local n = 0
 	for p in players.iterate do
 		if p.valid and not p.spectator then
 			n = $ + 1
+			if n == 2 then
+				return true
 			end
 		end
-	return n
+	end
+	return false
 end
 
 local function initLeaderboard(player)
+	if cv_enable.value and G_RaceGametype() then
 		if disable and leveltime < START_TIME then
-		disable = ingame() > 1
+			disable = TwoPlusInGame()
 		else
-		disable = disable or ingame() > 1
+			disable = $ or TwoPlusInGame()
+		end
+	else
+		disable = true
 	end
-	disable = $ or not cv_enable.value
 
 	-- Restore encore mode to initial value
 	if disable and EncoreInitial != nil then
@@ -324,7 +342,7 @@ end
 addHook("PlayerSpawn", initLeaderboard)
 
 local function doyoudare(player)
-	if ingame() > 1 or player.spectator then
+	if TwoPlusInGame() or player.spectator then
 		CONS_Printf(player, "How dare you")
 		return false
 	end
@@ -660,7 +678,7 @@ function ticsToTime(tics, pure)
 
 	return string.format(
 		"%d:%02d:%02d",
-		G_TicsToMinutes(tics),
+		G_TicsToMinutes(tics, true),
 		G_TicsToSeconds(tics),
 		G_TicsToCentiseconds(tics)
 	)
@@ -907,10 +925,10 @@ local function drawScroll(v, player, scoreTable, gui)
 		local x = 10
 		if #scoreTable >= 10 then
 			x = x + 8
-		end
 			if #scoreTable >= 100 then
 				x = x + 8
 			end
+		end
 
 		local y = FixedInt(scrollY)
 
@@ -961,8 +979,6 @@ local function drawScoreboard(v, player)
 
 	cachePatches(v)
 
-	local scoreTable = getScoreTable(gamemap, Flags)
-
 	local gui = cv_gui.value
 	if leveltime < START_TIME or player.exiting or player.lives == 0 then
 		gui = GUI_ON
@@ -1009,7 +1025,7 @@ end
 
 -- Find location of player and scroll to it
 function scroll_to(player)
-	local m = getScoreTable(gamemap, Flags) or {}
+	local m = scoreTable or {}
 
 	scrollToPos = 2
 	for pos, score in ipairs(m) do
@@ -1038,7 +1054,8 @@ local function writeStats()
 end
 
 local function saveTime(player)
-	local scoreTable = getScoreTable(gamemap, Flags) or {}
+
+	scoreTable =  $ or {}
 
 	local pskin = skins[player.mo.skin]
 	local newscore = score_t(
@@ -1145,7 +1162,8 @@ local function think()
 	end
 
 	if disable then
-		if cv_afk.value and ingame() > 1 then
+		if AntiAFK 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 then
@@ -1170,6 +1188,7 @@ local function think()
 					end
 				end
 			end
+		end
 
 		help = true
 		return
@@ -1181,7 +1200,7 @@ local function think()
 	if leveltime < START_TIME then
 		-- Help message
 		if leveltime == START_TIME - TICRATE * 3 then
-			if ingame() == 1  then
+			if p then
 				if help then
 					help = false
 					chatprint(HELP_MESSAGE, true)
@@ -1217,14 +1236,14 @@ local function think()
 			end
 			if clearcheats then
 				clearcheats = false
-				for p in players.iterate do
+				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
-			for p in players.iterate do
+
-				if not p.spectator then
+			if p then
 				if p.SPBAKARTBIG then
 					Flags = $ | F_SPBBIG
 				end
@@ -1232,14 +1251,19 @@ local function think()
 					Flags = $ | F_SPBJUS
 				end
 			end
-			end
+
 		end
 		if not (Flags & F_SPBATK) then
 			hud.enable("freeplay")
 		end
 	end
 
-	local cv_teamchange = CV_FindVar("allowteamchange")
+	scoreTable = getScoreTable(gamemap, Flags)
+
+	if not cv_teamchange then
+		cv_teamchange = CV_FindVar("allowteamchange")
+	end
+
 	if p then
 		-- Scroll controller
 		-- Spectators can't input buttons so let the gamer do it
@@ -1264,6 +1288,7 @@ local function think()
 			p.afkTime = leveltime
 		end
 
+		if not replayplayback then
 			if leveltime > PREVENT_JOIN_TIME and p.afkTime + AFK_TIMEOUT > leveltime then
 				if cv_teamchange.value then
 					allowJoin(false)
@@ -1273,6 +1298,7 @@ local function think()
 					allowJoin(true)
 				end
 			end
+		end
 
 		if p.laps >= mapheaderinfo[gamemap].numlaps and timeFinished == 0 then
 			timeFinished = p.realtime
@@ -1290,11 +1316,17 @@ local function interThink()
 		COM_BufInsertText(server, "map " + nextMap)
 		nextMap = nil
 	end
-	if not CV_FindVar("allowteamchange").value then
+
+	if not cv_teamchange then
+		cv_teamchange = CV_FindVar("allowteamchange")
+	end
+
+	if not cv_teamchange.value then
 		allowJoin(true)
 	end
 end
 addHook("IntermissionThinker", interThink)
+addHook("VoteThinker", interThink)
 
 -- Returns the values clamed between min, max
 function clamp(min_v, v, max_v)