summaryrefslogtreecommitdiff
path: root/src/fpsgame/server.cpp
diff options
context:
space:
mode:
authorxolatile2025-07-20 12:18:48 +0200
committerxolatile2025-07-20 12:18:48 +0200
commitc46daa31f8e0339aed12736699d0003d27f1fc7e (patch)
tree11083f9c5eced31cf246c5feadc2c96d66e165cb /src/fpsgame/server.cpp
parente9ad09c58820b31743251f793f30e5d4d49a0dca (diff)
downloadxolatile-badassbug-c46daa31f8e0339aed12736699d0003d27f1fc7e.tar.xz
xolatile-badassbug-c46daa31f8e0339aed12736699d0003d27f1fc7e.tar.zst
Most warnings fixed, ignoring one warning for now...
Diffstat (limited to 'src/fpsgame/server.cpp')
-rw-r--r--src/fpsgame/server.cpp6
1 files changed, 4 insertions, 2 deletions
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);
}