Merge pull request 'Only save/load files for the server' (#6) from Lonsfor/srb2k-leaderboard:lonsfor-patch-3 into master

Reviewed-on: #6

browser.lua

@@ -266,15 +266,18 @@ local function drawFlags(v, x, y, flags)
 	end
 end
 
+local MSK_SPEED = 0xF0
+local MSK_WEIGHT = 0xF
+
 local function drawStats(v, x, y, skin, stats)
 	local s = skins[skin]
-	if not (s
+	if stats
-		and s.kartspeed == stats["speed"]
+		and not (s
-		and s.kartweight == stats["weight"]
+		and s.kartspeed == (stats & MSK_SPEED) >> 4
-		)
+		and s.kartweight == stats & MSK_WEIGHT
-		and stats then
+		) then
-		v.drawString(x-2, y-2, stats["speed"], V_ALLOWLOWERCASE, "thin")
+		v.drawString(x-2, y-2, (stats & MSK_SPEED) >> 4, V_ALLOWLOWERCASE, "thin")
-		v.drawString(x + 13, y + 9, stats["weight"], V_ALLOWLOWERCASE, "thin") 
+		v.drawString(x + 13, y + 9, stats & MSK_WEIGHT, V_ALLOWLOWERCASE, "thin")
 	end
 end
 

leaderboard.lua

@@ -253,25 +253,26 @@ 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 {
+		return (speed << 4) | weight
-			["speed"] = speed,
-			["weight"] = weight
-		}
 	end
-	return nil
+	return 0
 end
 
 local function stat_str(stat)
 	if stat then
-		return string.format("%d%d", stat["speed"], stat["weight"])
+		return string.format("%d%d", (stat & MSK_SPEED) >> 4, stat & MSK_WEIGHT)
 	end
 
 	return "0"
 end
 
 -- Read the leaderboard
+if isserver then
 	local f = io.open(FILENAME, "r")
 	if f then
 		for l in f:lines() do
@@ -327,6 +328,7 @@ if f then
 	else
 		print("Failed to open file: ", FILENAME)
 	end
+end
 
 function allowJoin(v)
 	if not cv_interrupt.value then
@@ -987,11 +989,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["weight"]
+			and pskin.kartweight == stat & MSK_WEIGHT
-			and pskin.kartspeed == stat["speed"]
+			and pskin.kartspeed == (stat & MSK_SPEED) >> 4
 		) then
-		v.drawString(x + FACERANK_DIM - 2, y + 4, stat["speed"], V_HUDTRANS | VFLAGS, "small")
+		v.drawString(x + FACERANK_DIM - 2, y + 4, (stat & MSK_SPEED) >> 4, V_HUDTRANS | VFLAGS, "small")
-		v.drawString(x + FACERANK_DIM - 2, y + 8, stat["weight"], V_HUDTRANS | VFLAGS, "small")
+		v.drawString(x + FACERANK_DIM - 2, y + 8, stat & MSK_WEIGHT, V_HUDTRANS | VFLAGS, "small")
 	end
 
 	if gui == GUI_ON or (gui == GUI_SPLITS and showSplit) then
@@ -1221,7 +1223,43 @@ 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 {}
 
@@ -1279,6 +1317,7 @@ local function saveTime(player)
 		StatTrack = true
 	end
 
+	if isserver then
 		local f = assert(io.open(FILENAME, "w"))
 		if f == nil then
 			print("Failed to open file for writing: " + FILENAME)
@@ -1304,6 +1343,7 @@ local function saveTime(player)
 
 		f:close()
 	end
+end
 
 -- DEBUGGING
 --local function saveLeaderboard(player, ...)
@@ -1387,13 +1427,7 @@ 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
@@ -1402,49 +1436,29 @@ local function think()
 				end
 			end
 		end
-		if not cv_spbatk then
-			cv_spbatk = CV_FindVar("spbatk")
-		end
 
-		-- Gamemode flags
+		if leveltime > START_TIME - (3 * TICRATE) / 2 then
-		Flags = $ & !(F_SPBATK | F_SPBEXP | F_SPBBIG | F_SPBJUS)
-		if server.SPBArunning
-		   and cv_spbatk.value
-		   and leveltime > START_TIME - (3 * TICRATE) / 2 then
-			Flags = $ | F_SPBATK
-			if server.SPBAexpert then
-				Flags = $ | F_SPBEXP
-			end
 			if clearcheats then
 				clearcheats = false
-				for q in players.iterate do
+				if p then
-					q.SPBAKARTBIG = false
+					p.SPBAKARTBIG = false
-					q.SPBAjustice = false
+					p.SPBAjustice = false
-					q.SPBAshutup = false
+					p.SPBAshutup = false
 				end
 			end
 
-			if p then
+			Flags = checkFlags(p)
-				if p.SPBAKARTBIG then
-					Flags = $ | F_SPBBIG
-				end
-				if p.SPBAjustice then
-					Flags = $ | F_SPBJUS
-				end
-			end
 
 			-- make sure the spb actually spawned
-			if leveltime == START_TIME - 1 then
+			if server.SPBArunning and 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
 			hud.enable("freeplay")
 		end
-
 	end
 
 	scoreTable = getScoreTable(gamemap, Flags)
@@ -1454,6 +1468,12 @@ 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
@@ -1478,7 +1498,7 @@ local function think()
 			end
 
 			-- disable spba hud
-			if server.SPBAdone then
+			if server.SPBArunning and server.SPBAdone then
 				server.SPBArunning = false
 				p.pflags = $ & !(PF_TIMEOVER)
 				p.exiting = 100
@@ -1509,10 +1529,6 @@ 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)