Handle negative flag scores

diff --git a/ctfws-lfs-strings.lua b/ctfws-lfs-strings.lua
index 847f4e73785871bd61e48d8249bf30ead631bebc..58fea800ce5d77e7f098192c4b148706ec42b0dd 100644 (file)
--- a/ctfws-lfs-strings.lua
+++ b/ctfws-lfs-strings.lua
@@ -37,7 +37,7 @@ local init3load =
   "ctfws/game/message/jail",
   "none",
   "^%s*(%d+)%s+(%d+)%s+(%d+)%s+(%d+)%s+(%d+).*$",
-  "^%s*(%d+)%s+(%d+).*$",
+  "^%s*(%d+)%s+(-?%d+)%s+(-?%d+).*$",
   "^%s*(%d+)%s*(.*)$",
   "^%s*%?.*$",
   "^ctfws/game/message",

diff --git a/init3.lua b/init3.lua
index de0f5a15b8da4d1046e6f9fac046318fae545c37..39cebd13051cdd132e28b8a0f281c05e7bed45f9 100644 (file)
--- a/init3.lua
+++ b/init3.lua
@@ -104,7 +104,7 @@ nwfnet.onmqtt["init"] = function(c,t,m)
      if ctfws:setFlags("?","?") then ctfws_lcd:drawFlags() end
      return
    end
-   local ts, fr, fy = m:match("^%s*(%d+)%s+(%d+)%s+(%d+).*$")
+   local ts, fr, fy = m:match("^%s*(%d+)%s+(-?%d+)%s+(-?%d+).*$")
    if ts ~= nil then
      if ctfws:setFlags(tonumber(fr),tonumber(fy)) then ctfws_lcd:drawFlags() end
      return