From: Tim Parenti <tjtrumpet2323@gmail.com>
Date: Sun, 11 Nov 2018 00:01:00 +0000 (-0500)
Subject: Exclude setup time from elapsed time on Game Over screen.
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=985a0a93a5b59927a5c9e2afddc96cacb1c61040;p=acmetensortoys-esp-lua_ctfws

Exclude setup time from elapsed time on Game Over screen.

Fixes #1.
---

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()