Port weapon reload code server side from Xonotic (code I made for all weapons there).

[voretournament/voretournament.git] / data / qcsrc / server / cl_client.qc

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index b5f1333ff0fe24ae59737a253c3b8d5e1036ac69..19f8d0c9fe90230925864dc2c9bbdbf94de2bfe7 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -992,8 +992,16 @@ void PutClientInServer (void)
 \r
                // reset fields the weapons may use\r
         for (j = WEP_FIRST; j <= WEP_LAST; ++j)\r
+               {\r
             weapon_action(j, WR_RESETPLAYER);\r
 \r
+                       // all weapons must be fully loaded when we spawn\r
+                       entity e;\r
+                       e = get_weaponinfo(j);\r
+                       if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars\r
+                               self.weapon_load[j] = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));\r
+               }\r
+\r
                oldself = self;\r
                self = spot;\r
                        activator = oldself;\r