diff --git a/Zframework/toolfunc.lua b/Zframework/toolfunc.lua index 94c38233..bd2b7b73 100644 --- a/Zframework/toolfunc.lua +++ b/Zframework/toolfunc.lua @@ -2,7 +2,7 @@ local gc=love.graphics local int=math.floor local format=string.format -do +do--setFont local newFont=gc.setNewFont local setNewFont=gc.setFont local fontCache,currentFontSize={} diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 25bea0b1..19aae09f 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -209,13 +209,14 @@ function freshMostBadge() game.mostBadge,game.secBadge=nil local m,m2=0,0 for i=1,#players.alive do - local h=players.alive[i].badge - if h>=m then - game.mostBadge,game.secBadge=players.alive[i],game.mostBadge - m,m2=h,m - elseif h>=m2 then - game.secBadge=players.alive[i] - m2=h + local P=players.alive[i] + local b=P.badge + if b>=m then + game.mostBadge,game.secBadge=P,game.mostBadge + m,m2=b,m + elseif b>=m2 then + game.secBadge=P + m2=b end end end diff --git a/parts/tick.lua b/parts/tick.lua index 8b7936f4..fd4e71ce 100644 --- a/parts/tick.lua +++ b/parts/tick.lua @@ -1,4 +1,3 @@ -local gc=love.graphics local Tick={} function Tick.finish(P) P.endCounter=P.endCounter+1