leaderboard.lua

@@ -12,6 +12,7 @@ local splits = {}
 local PATCH = nil
 local help = true
 local EncoreInitial = nil
+local cv_teamchange
 local scoreTable
 
 
@@ -90,10 +91,6 @@ local ticsToTime
 local allowJoin
 ---------------
 
--- cvars
-local cv_teamchange
-local cv_spbatk
-
 local cv_gui = CV_RegisterVar({
 	name = "lb_gui",
 	defaultvalue = GUI_ON,
@@ -1382,15 +1379,10 @@ local function think()
 				end
 			end
 		end
-		if not cv_spbatk then
-			cv_spbatk = CV_FindVar("spbatk")
-		end
 
 		-- Gamemode flags
 		Flags = $ & !(F_SPBATK | F_SPBEXP | F_SPBBIG | F_SPBJUS)
-		if server.SPBArunning
-		   and cv_spbatk.value
-		   and leveltime > START_TIME - (3 * TICRATE) / 2 then
+		if leveltime > START_TIME - (3 * TICRATE) / 2 and server.SPBArunning then
 			Flags = $ | F_SPBATK
 			if server.SPBAexpert then
 				Flags = $ | F_SPBEXP
@@ -1413,18 +1405,10 @@ local function think()
 				end
 			end
 
-			-- make sure the spb actually spawned
-			if leveltime == START_TIME - 1 then
-				if not (server.SPBAbomb and server.SPBAbomb.valid) then
-					-- it didn't spawn, clear spb flags
-					Flags = $ & !(F_SPBATK | F_SPBEXP | F_SPBBIG | F_SPBJUS)
 		end
-			end
-
-		else
+		if not (Flags & F_SPBATK) then
 			hud.enable("freeplay")
 		end
-
 	end
 
 	scoreTable = getScoreTable(gamemap, Flags)