deserialize splits when needed

leaderboard.lua

@@ -271,63 +271,68 @@ local function stat_str(stat)
 	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
-if isserver then
+local f = io.open(FILENAME, "r")
-	local f = io.open(FILENAME, "r")
+if f then
-	if f then
+	for l in f:lines() do
-		for l in f:lines() do
+		-- Leaderboard is stored in the following tab separated format
-			-- Leaderboard is stored in the following tab separated format
+		-- mapnum, name, skin, color, time, splits, flags, stat
-			-- mapnum, name, skin, color, time, splits, flags, stat
+		local t = {}
-			local t = {}
+		for word in (l+"\t"):gmatch("(.-)\t") do
-			for word in (l+"\t"):gmatch("(.-)\t") do
+			table.insert(t, word)
-				table.insert(t, word)
-			end
-
-			local flags = 0
-			if t[7] != nil then
-				flags = tonumber(t[7])
-			end
-
-			scoreTable = getScoreTable(tonumber(t[1]), flags) 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
-				if #t[8] >= 2 then
-					local speed = tonumber(string.sub(t[8], 1, 1))
-					local weight = tonumber(string.sub(t[8], 2, 2))
-					stats = stat_t(speed, weight)
-				end
-			end
-
-			table.insert(
-				scoreTable,
-				score_t(
-					tonumber(t[1]),
-					t[2],
-					t[3],
-					t[4],
-					tonumber(t[5]),
-					spl,
-					flags,
-					stats
-				)
-			)
-
-			setScoreTable(tonumber(t[1]), flags, scoreTable)
 		end
 
-		sortScores()
+		local flags = 0
-		f:close()
+		if t[7] != nil then
-	else
+			flags = tonumber(t[7])
-		print("Failed to open file: ", FILENAME)
+		end
+
+		scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
+
+		local spl = t[6] or ""
+
+		local stats = nil
+		if t[8] != nil then
+			if #t[8] >= 2 then
+				local speed = tonumber(string.sub(t[8], 1, 1))
+				local weight = tonumber(string.sub(t[8], 2, 2))
+				stats = stat_t(speed, weight)
+			end
+		end
+
+		table.insert(
+			scoreTable,
+			score_t(
+				tonumber(t[1]),
+				t[2],
+				t[3],
+				t[4],
+				tonumber(t[5]),
+				spl,
+				flags,
+				stats
+			)
+		)
+
+		setScoreTable(tonumber(t[1]), flags, scoreTable)
 	end
+
+	sortScores()
+	f:close()
+else
+	print("Failed to open file: ", FILENAME)
 end
 
 function allowJoin(v)
@@ -1030,8 +1035,9 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 		)
 
 		-- Draw splits
-		if showSplit and score["splits"] and score["splits"][prevLap] != nil then
+		local splts = splits_from_str(score["splits"])
-			local split = splits[prevLap] - score["splits"][prevLap]
+		if showSplit and splts and splts[prevLap] != nil then
+			local split = splits[prevLap] - splts[prevLap]
 			v.drawString(
 				x + px + FACERANK_DIM,
 				y + 8,
@@ -1270,7 +1276,7 @@ local function saveTime(player)
 		player.mo.skin,
 		player.skincolor,
 		timeFinished,
-		splits,
+		splits_to_str(splits),
 		Flags,
 		stat_t(player.HMRs or pskin.kartspeed, player.HMRw or pskin.kartweight)
 	)
@@ -1317,32 +1323,30 @@ local function saveTime(player)
 		StatTrack = true
 	end
 
-	if isserver then
+	local f = assert(io.open(FILENAME, "w"))
-		local f = assert(io.open(FILENAME, "w"))
+	if f == nil then
-		if f == nil then
+		print("Failed to open file for writing: " + FILENAME)
-			print("Failed to open file for writing: " + FILENAME)
+		return
-			return
+	end
-		end
 
-		for _, tbl in pairs(lb) do
+	for _, tbl in pairs(lb) do
-			for _, scoreTable in pairs(tbl) do
+		for _, scoreTable in pairs(tbl) do
-				for _, score in ipairs(scoreTable) do
+			for _, score in ipairs(scoreTable) do
-					f:write(
+				f:write(
-						score["map"], "\t",
+					score["map"], "\t",
-						score["name"], "\t",
+					score["name"], "\t",
-						score["skin"], "\t",
+					score["skin"], "\t",
-						score["color"], "\t",
+					score["color"], "\t",
-						score["time"], "\t",
+					score["time"], "\t",
-						table.concat(score["splits"], " "), "\t",
+					score["splits"], "\t",
-						score["flags"], "\t",
+					score["flags"], "\t",
-						stat_str(score["stat"]), "\n"
+					stat_str(score["stat"]), "\n"
-					)
+				)
-				end
 			end
 		end
-
-		f:close()
 	end
+
+	f:close()
 end
 
 -- DEBUGGING