From c46daa31f8e0339aed12736699d0003d27f1fc7e Mon Sep 17 00:00:00 2001
From: xolatile
Date: Sun, 20 Jul 2025 12:18:48 +0200
Subject: Most warnings fixed, ignoring one warning for now...

---
 src/fpsgame/server.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/fpsgame/server.cpp')

diff --git a/src/fpsgame/server.cpp b/src/fpsgame/server.cpp
index 7ea00a1..2df61f1 100644
--- a/src/fpsgame/server.cpp
+++ b/src/fpsgame/server.cpp
@@ -143,6 +143,7 @@ namespace server
         {
             if(state!=CS_SPECTATOR) state = editstate = CS_DEAD;
             maxhealth = 100;
+            maxarmour = 50;
             rockets.reset();
             grenades.reset();
 
@@ -1796,6 +1797,7 @@ namespace server
         putint(p, gs.health);
         putint(p, gs.maxhealth);
         putint(p, gs.armour);
+        putint(p, gs.maxarmour);
         putint(p, gs.armourtype);
         putint(p, gs.gunselect);
         loopi(GUN_PISTOL-GUN_SG+1) putint(p, gs.ammo[GUN_SG+i]);
@@ -1814,7 +1816,7 @@ namespace server
         spawnstate(ci);
         sendf(ci->ownernum, 1, "rii7v", N_SPAWNSTATE, ci->clientnum, gs.lifesequence,
             gs.health, gs.maxhealth,
-            gs.armour, gs.armourtype,
+            gs.armour, gs.maxarmour, gs.armourtype,
             gs.gunselect, GUN_PISTOL-GUN_SG+1, &gs.ammo[GUN_SG]);
         gs.lastspawn = gamemillis;
     }
@@ -2001,7 +2003,7 @@ namespace server
             gs.frags, gs.flags, gs.deaths, gs.quadmillis,
             gs.lifesequence,
             gs.health, gs.maxhealth,
-            gs.armour, gs.armourtype,
+            gs.armour, gs.maxarmour, gs.armourtype,
             gs.gunselect, GUN_PISTOL-GUN_SG+1, &gs.ammo[GUN_SG], -1);
     }
 
-- 
cgit v1.2.3