First part of a more common weapon reload code. Implemented for the hagar currently...

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index f2c4447faeeec9298f6223158fa5054f94b58c40..eac82741090d46d74a443428aed7aa1f4b32a3a4 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1612,6 +1612,8 @@ void W_SetupProjectileVelocity(entity missile, float pSpeed, float spread)
 #define W_SETUPPROJECTILEVELOCITY_UP(m,s) W_SetupProjectileVelocityEx(m, w_shotdir, v_up, cvar(#s "_speed"), cvar(#s "_speed_up"), cvar(#s "_speed_z"), cvar(#s "_spread"), FALSE)
 #define W_SETUPPROJECTILEVELOCITY(m,s) W_SetupProjectileVelocityEx(m, w_shotdir, v_up, cvar(#s "_speed"), 0, 0, cvar(#s "_spread"), FALSE)
 
+// weapon reloading code
+
 .float reload_complain;
 float W_ReloadCheck(float ammo_amount, float ammo_shot)
 {
@@ -1619,7 +1621,7 @@ float W_ReloadCheck(float ammo_amount, float ammo_shot)
        e = get_weaponinfo(self.weapon);
 
        // our weapon is fully loaded, no need to reload
-       if (self.clip_load >= cvar(strcat("g_balance_", e.netname, "_reload_ammo")))
+       if (self.clip_load >= self.reload_ammo_amount)
                return 0;
 
        // no ammo, so nothing to load
@@ -1650,4 +1652,44 @@ float W_ReloadCheck(float ammo_amount, float ammo_shot)
        }
 
        return 1;
+}
+
+void W_ReloadedAndReady()
+{
+       float t;
+
+       // now do the ammo transfer
+       self.clip_load = self.old_clip_load; // restore the ammo counter, in case we still had ammo in the weapon before reloading
+       while(self.clip_load < self.reload_ammo_amount && self.(self.reload_ammo_player)) // make sure we don't add more ammo than we have
+       {
+               self.clip_load += 1;
+               self.(self.reload_ammo_player) -= 1;
+       }
+       //self.hagar_load = self.clip_load;
+
+       t = ATTACK_FINISHED(self) - self.reload_time - 1;
+       ATTACK_FINISHED(self) = t;
+       w_ready();
+}
+
+void W_Reload()
+{
+       // return if reloading is disabled for this weapon
+       if(!self.reload_ammo_amount)
+               return;
+
+       if(!W_ReloadCheck(self.(self.reload_ammo_player), self.reload_ammo_min))
+               return;
+
+       float t;
+
+       sound (self, CHAN_WEAPON2, self.reload_sound, VOL_BASE, ATTN_NORM);
+
+       t = max(time, ATTACK_FINISHED(self)) + self.reload_time + 1;
+       ATTACK_FINISHED(self) = t;
+
+       weapon_thinkf(WFRAME_RELOAD, self.reload_time, W_ReloadedAndReady);
+
+       self.old_clip_load = self.clip_load;
+       self.clip_load = -1;
 }
\ No newline at end of file

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 918f865b0d84029e4466edf046bb3b20369dd6f4..f60aad976fbbf014ed713f79ecb4b23fdc628196 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -616,6 +616,10 @@ float client_cefc_accumulatortime;
 .float old_clip_load;
 .float clip_size;
 
+..float reload_ammo_player;
+.float reload_ammo_amount, reload_ammo_min, reload_time;
+.string reload_sound;
+
 #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_hagar.qc b/qcsrc/server/w_hagar.qc
index 25c033b8910effbcc1cac65bd87a69b2a49557fa..6572e2c9efca198fe73599572994411d0b148ab3 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -19,44 +19,15 @@ void W_Hagar_SetAmmoCounter()
        }
 }
 
-void W_Hagar_ReloadedAndReady()
-{
-       float t;
-
-       // now do the ammo transfer
-       self.clip_load = self.old_clip_load; // restore the ammo counter, in case we still had ammo in the weapon before reloading
-       while(self.clip_load < autocvar_g_balance_hagar_reload_ammo && self.ammo_rockets) // make sure we don't add more ammo than we have
-       {
-               self.clip_load += 1;
-               self.ammo_rockets -= 1;
-       }
-       self.hagar_load = self.clip_load;
-
-       t = ATTACK_FINISHED(self) - autocvar_g_balance_hagar_reload_time - 1;
-       ATTACK_FINISHED(self) = t;
-       w_ready();
-}
-
 void W_Hagar_Reload()
 {
-       // return if reloading is disabled for this weapon
-       if(!autocvar_g_balance_hagar_reload_ammo)
-               return;
-
-       if(!W_ReloadCheck(self.ammo_rockets, min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo)))
-               return;
-
-       float t;
-
-       sound (self, CHAN_WEAPON2, "weapons/reload.wav", VOL_BASE, ATTN_NORM);
-
-       t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_hagar_reload_time + 1;
-       ATTACK_FINISHED(self) = t;
-
-       weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_hagar_reload_time, W_Hagar_ReloadedAndReady);
+       self.reload_ammo_player = ammo_rockets;
+       self.reload_ammo_min = min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo);
+       self.reload_ammo_amount = autocvar_g_balance_hagar_reload_ammo;
+       self.reload_time = autocvar_g_balance_hagar_reload_time;
+       self.reload_sound = "weapons/reload.wav";
 
-       self.old_clip_load = self.clip_load;
-       self.clip_load = -1;
+       W_Reload();
 }
 
 void W_Hagar_Explode (void)