This commit is contained in:
Not 2022-03-28 13:12:16 +02:00
parent 36134572af
commit 3101d29dcc
1 changed files with 26 additions and 9 deletions

View File

@ -251,6 +251,7 @@ local splitColor = {[true]=V_SKYMAP, [false]=V_REDMAP}
local splitSymbol = {[true]="-", [false]="+"}
local showSplit = 0
local VFLAGS = V_SNAPTOLEFT
local function drawScoreboard(v, player)
if disable then return end
if player != displayplayers[0] then return end
@ -273,9 +274,9 @@ local function drawScoreboard(v, player)
-- | OFFSET | + | PADDING | * |INDEX|
local h = ((200 / 4) + 4) + (skinPatch.height + 4) * (i - 1)
v.draw(4, h, skinPatch, V_HUDTRANS, v.getColormap("sonic", score["color"]))
v.draw(4, h, skinPatch, V_HUDTRANS | VFLAGS, v.getColormap("sonic", score["color"]))
if player.name == name then
v.draw(4, h, PATCH["CHILI"][(leveltime / 4) % 8], V_HUDTRANS)
v.draw(4, h, PATCH["CHILI"][(leveltime / 4) % 8], V_HUDTRANS | VFLAGS)
end
-- SPB
@ -287,7 +288,7 @@ local function drawScoreboard(v, player)
h - 2,
scale,
PATCH["SPB"],
V_HUDTRANS
V_HUDTRANS | VFLAGS
)
if score["flags"] & F_SPBEXP then
drawitem(
@ -296,7 +297,7 @@ local function drawScoreboard(v, player)
h - 2,
scale,
PATCH["INV"][(leveltime / 4) % 6],
V_HUDTRANS
V_HUDTRANS | VFLAGS
)
end
if score["flags"] & F_SPBBIG then
@ -306,7 +307,7 @@ local function drawScoreboard(v, player)
h + skinPatch.height - 4,
scale,
PATCH["BIG"],
V_HUDTRANS
V_HUDTRANS | VFLAGS
)
end
if score["flags"] & F_SPBJUS then
@ -316,7 +317,7 @@ local function drawScoreboard(v, player)
h + skinPatch.height - 4,
scale,
PATCH["HYUD"],
V_HUDTRANS
V_HUDTRANS | VFLAGS
)
end
end
@ -338,14 +339,30 @@ local function drawScoreboard(v, player)
end
end
v.drawString(px + skinPatch.width, h + py, name, V_HUDTRANSHALF | V_ALLOWLOWERCASE, stralign)
v.drawString(
px + skinPatch.width,
h + py,
name,
V_HUDTRANSHALF | V_ALLOWLOWERCASE | VFLAGS,
stralign
)
-- Draw splits
if showSplit > 0 and score["splits"][prevLap] != nil then
local split = splits[prevLap] - score["splits"][prevLap]
v.drawString(px + skinPatch.width, h + 8, splitSymbol[split < 0] + ticsToTime(abs(split)), V_HUDTRANSHALF | splitColor[split < 0])
v.drawString(
px + skinPatch.width,
h + 8,
splitSymbol[split < 0] + ticsToTime(abs(split)),
V_HUDTRANSHALF | splitColor[split < 0] | VFLAGS
)
else
v.drawString(px + skinPatch.width, h + 8, ticsToTime(score["time"]), V_HUDTRANSHALF | bodium[min(i, 4)])
v.drawString(
px + skinPatch.width,
h + 8,
ticsToTime(score["time"]),
V_HUDTRANSHALF | bodium[min(i, 4)] | VFLAGS
)
end
end
end