Move load persistence floats back to their weapon files. That should be the last...

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 10f6763fb530eb199c8394b1edf2c52306abd44f..ec82bf6530c0618434ed9004e92183112f6c0c64 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -616,23 +616,6 @@ float client_cefc_accumulatortime;
 .float old_clip_load;
 .float clip_size;
 
-// weapon load persistence, for weapons that support reloading
-.float laser_load;
-.float shotgun_load;
-.float uzi_load;
-.float grenadelauncher_load;
-.float minelayer_load;
-.float electro_load;
-.float crylink_load;
-.float hlac_load;
-.float nex_load;
-.float minstanex_load;
-.float sniperrifle_load;
-.float seeker_load;
-.float hagar_load;
-.float fireball_load;
-.float rocketlauncher_load;
-
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // when doing this, hagar can go through clones
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 6a823b920622fd24224825385ca43108eb495387..d20811bfad86c8ee9516be0a9be1b53f53293a9d 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -9,6 +9,9 @@ REGISTER_WEAPON(CRYLINK, w_crylink, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_TYPE_SPLA
 .entity queuenext;
 .entity queueprev;
 
+// weapon load persistence, for weapons that support reloading
+.float crylink_load;
+
 void W_Crylink_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index a6edd8f2d2f28e5c861fea99065c3ae4f5d5b3ba..4ad5157d25520de700fdbdde5b1b93eb17d05d6e 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -5,6 +5,9 @@ REGISTER_WEAPON(ELECTRO, w_electro, IT_CELLS, 5, WEP_FLAG_NORMAL | WEP_TYPE_SPLA
 .float electro_count;
 .float electro_secondarytime;
 
+// weapon load persistence, for weapons that support reloading
+.float electro_load;
+
 void W_Electro_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index f8f745a967f9fa698e36cbd42319cd3471b81d7c..dd1793906303d5868713a030d39ebfdc89d1dc65 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -6,6 +6,9 @@ REGISTER_WEAPON(FIREBALL, w_fireball, IT_FUEL, 9, WEP_TYPE_SPLASH, BOT_PICKUP_RA
 .vector fireball_impactvec;
 .float fireball_primarytime;
 
+// weapon load persistence, for weapons that support reloading
+.float fireball_load;
+
 void W_Fireball_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 43ca764747a358a5f8899abe302e891b7bccbf60..970cfa72d1922443723eb1d7a55d5dda46e68b43 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -5,6 +5,9 @@ REGISTER_WEAPON(GRENADE_LAUNCHER, w_glauncher, IT_ROCKETS, 4, WEP_FLAG_NORMAL |
 .float gl_detonate_later;
 .float gl_bouncecnt;
 
+// weapon load persistence, for weapons that support reloading
+.float grenadelauncher_load;
+
 void W_GrenadeLauncher_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index cbc146915c122e05180851ec3f383afc0f2595be..e982c3a213718828b3986f302074a12ff4c2d0b8 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -4,6 +4,9 @@ REGISTER_WEAPON(HAGAR, w_hagar, IT_ROCKETS, 8, WEP_FLAG_NORMAL | WEP_FLAG_CANCLI
 #ifdef SVQC
 // NO bounce protection, as bounces are limited!
 
+// weapon load persistence, for weapons that support reloading
+.float hagar_load;
+
 void W_Hagar_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index ad12e740d76101b7f6a7a188d089c163dc97f858..10ae59c0367d410762a16cd999d85224000c0382 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -3,6 +3,9 @@ REGISTER_WEAPON(HLAC, w_hlac, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BO
 #else
 #ifdef SVQC
 
+// weapon load persistence, for weapons that support reloading
+.float hlac_load;
+
 void W_HLAC_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 222feb1c56a3261dc4c1899195bd64e5764411c2..25e272c766a0615af86affb7ea73733130b18dcc 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -4,6 +4,9 @@ REGISTER_WEAPON(LASER, w_laser, 0, 1, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_
 #ifdef SVQC
 void(float imp) W_SwitchWeapon;
 
+// weapon load persistence, for weapons that support reloading
+.float laser_load;
+
 void W_Laser_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index b8adb65ff0ef464e2076b89e41b2298bb2009b25..d2d182223c1f1390c9ad74ff042a1db5d219f1d5 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -6,6 +6,9 @@ void W_Mine_Think (void);
 .float minelayer_detonate, minelayer_mines;
 .float mine_time;
 
+// weapon load persistence, for weapons that support reloading
+.float minelayer_load;
+
 void W_MineLayer_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 03b072b8df8d8c0f1aec1db5eadec1d86e592f42..a26dba22fb40bfe6895cbb6766171bbc3a8b7e76 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -4,6 +4,9 @@ REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_
 #ifdef SVQC
 .float minstanex_lasthit;
 
+// weapon load persistence, for weapons that support reloading
+.float minstanex_load;
+
 void W_Minstanex_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 1210372d1aa310d0389e065f21200c1fab1f184a..03806f9f9f27926d90dc1d65257db69ac9a08c9d 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -3,6 +3,9 @@ REGISTER_WEAPON(NEX, w_nex, IT_CELLS, 7, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT
 #else
 #ifdef SVQC
 
+// weapon load persistence, for weapons that support reloading
+.float nex_load;
+
 void W_Nex_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index 85f855e137fcb0871725f6bb0752c2284a77c87e..85116a1e03df31f37ea23faf52edeae54396cdac 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -5,6 +5,9 @@ REGISTER_WEAPON(ROCKET_LAUNCHER, w_rlauncher, IT_ROCKETS, 9, WEP_FLAG_NORMAL | W
 .float rl_release;
 .float rl_detonate_later;
 
+// weapon load persistence, for weapons that support reloading
+.float rocketlauncher_load;
+
 void W_RocketLauncher_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index a259c74afa00feb8bde9a8ee9e4095d8c5093f5c..cb050f399ca7d8e8845fd664df3e18bba84ce665 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -5,6 +5,9 @@ REGISTER_WEAPON(SEEKER, w_seeker, IT_ROCKETS, 8, WEP_FLAG_NORMAL | WEP_TYPE_SPLA
 //.float proxytime; = autoswitch
 //.float tl; = wait
 
+// weapon load persistence, for weapons that support reloading
+.float seeker_load;
+
 void W_Seeker_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 78060ec7d66b34785047a63420ea3a3aca644040..7d515ddeea28c0857dadc25b817386fc4bd62a55 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -3,6 +3,9 @@ REGISTER_WEAPON(SHOTGUN, w_shotgun, IT_SHELLS, 2, WEP_FLAG_NORMAL | WEP_TYPE_HIT
 #else
 #ifdef SVQC
 
+// weapon load persistence, for weapons that support reloading
+.float shotgun_load;
+
 void W_Shotgun_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index 9e016b256036790c6e0a663713fb85483e02fc15..c19c7442721e7ce5aca691e3c77fdadbd15f5cc2 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -8,6 +8,9 @@ REGISTER_WEAPON(SNIPERRIFLE, w_sniperrifle, IT_NAILS, 7, WEP_FLAG_NORMAL | WEP_T
 
 .float sniperrifle_accumulator;
 
+// weapon load persistence, for weapons that support reloading
+.float sniperrifle_load;
+
 void W_SniperRifle_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index b52a741a3971c41a236562ca4721039ae17971e2..1fe188e69ef17145c7ee49987a69afccd67974e6 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -3,6 +3,9 @@ REGISTER_WEAPON(UZI, w_uzi, IT_NAILS, 3, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT
 #else
 #ifdef SVQC
 
+// weapon load persistence, for weapons that support reloading
+.float uzi_load;
+
 void W_UZI_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading