From 985a0a93a5b59927a5c9e2afddc96cacb1c61040 Mon Sep 17 00:00:00 2001 From: Tim Parenti Date: Sat, 10 Nov 2018 19:01:00 -0500 Subject: [PATCH] Exclude setup time from elapsed time on Game Over screen. Fixes #1. --- ctfws.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ctfws.lua b/ctfws.lua index 3b76625..f60a0bc 100644 --- a/ctfws.lua +++ b/ctfws.lua @@ -21,10 +21,13 @@ local function times(self, nowf) return nil, "GAME NOT CONFIGURED!" end - -- Game declared over; show total elapsed time + -- Game declared over; show total elapsed time in game (excluding setup) if self.endT and self.endT >= self.startT then - local t = self.endT - self.startT - return nil, string.format("GAME OVER @ %02d:%02d", t/60, t%60) + local t = (self.endT - self.startT) - (self.setupD / 10) + if t < 0 + then return nil, "GAME OVER" + else return nil, string.format("GAME OVER @ %02d:%02d", t/60, t%60) + end end local now_sec, now_usec = nowf() -- 2.50.1