From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 22 Jan 2011 23:04:47 +0000 (+0200)
Subject: Remove the wish_reload system. WR_RELOAD can replace it
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~96
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c74eb28792cb147e9e7427d4080a8f020a754490;p=xonotic%2Fxonotic-data.pk3dir.git
Remove the wish_reload system. WR_RELOAD can replace it
---
diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 864dd77fce..db53b01810 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -1,6 +1,6 @@
void W_Reload()
{
- self.wish_reload = 1;
+ weapon_action(self.switchweapon, WR_RELOAD);
}
// switch between weapons
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 06d0a3bf57..10f6763fb5 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -615,7 +615,6 @@ float client_cefc_accumulatortime;
.float clip_load;
.float old_clip_load;
.float clip_size;
-.float wish_reload;
// weapon load persistence, for weapons that support reloading
.float laser_load;
diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 74b6e92736..21f3790fa5 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -650,17 +650,6 @@ float w_crylink(float req)
}
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_Crylink_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 01da65d838..44a1a91672 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -525,18 +525,6 @@ float w_electro(float req)
}
}
}
-
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_Electro_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index e3b9e33429..dfb3605b00 100644
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -420,17 +420,6 @@ float w_fireball(float req)
weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_fireball_secondary_animtime, w_ready);
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_Fireball_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 5e5f961635..2a26eeae51 100644
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -388,17 +388,6 @@ float w_glauncher(float req)
weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_grenadelauncher_secondary_animtime, w_ready);
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_GrenadeLauncher_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 907db356cd..0d4c38765d 100644
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -219,17 +219,6 @@ float w_hagar(float req)
weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_refire, w_ready);
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_Hagar_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index c87baf2162..08cfd69af5 100644
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -257,17 +257,6 @@ float w_hlac(float req)
weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hlac_secondary_animtime, w_ready);
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_HLAC_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index f3bd6e0b13..ac79e9c5f6 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -317,17 +317,6 @@ float w_laser(float req)
W_SwitchWeapon (self.cnt);
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_Laser_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 1b35ab4efd..50f392f9bc 100644
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -453,18 +453,6 @@ float w_minelayer(float req)
if(minfound)
sound (self, CHAN_WEAPON2, "weapons/mine_det.wav", VOL_BASE, ATTN_NORM);
}
-
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_MineLayer_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 81c1987fab..e5c9a1ed83 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -293,17 +293,6 @@ float w_minstanex(float req)
self.weapon = w;
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_Minstanex_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index d3e1b07d6b..49c4d38876 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -264,18 +264,6 @@ float w_nex(float req)
self.weaponentity_glowmod_z = self.weaponentity_glowmod_z + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_full * (self.nex_charge - autocvar_g_balance_nex_charge_limit) / (1 - autocvar_g_balance_nex_charge_limit);
}
}
-
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_Nex_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index 3dec2732a6..168e9d2bdc 100644
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -495,17 +495,6 @@ float w_rlauncher(float req)
sound (self, CHAN_WEAPON2, "weapons/rocket_det.wav", VOL_BASE, ATTN_NORM);
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_RocketLauncher_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 42f0ec3495..cda5bcbf10 100644
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -517,18 +517,6 @@ float w_seeker(float req)
weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_seeker_flac_animtime, w_ready);
}
}
-
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_Seeker_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 48ef90e1b4..5fa5fa4c92 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -194,17 +194,6 @@ float w_shotgun(float req)
weapon_thinkf(WFRAME_FIRE1, 0, W_Shotgun_Attack2);
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_Shotgun_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index 01326774f3..1ef0c92a73 100644
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -227,17 +227,6 @@ float w_sniperrifle(float req)
}
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_SniperRifle_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{
diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index 3ec7019e68..3b43d52043 100644
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -321,17 +321,6 @@ float w_uzi(float req)
weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_uzi_first_refire, w_ready);
}
}
- if(self.wish_reload)
- {
- if(self.switchweapon == self.weapon)
- {
- if(self.weaponentity.state == WS_READY)
- {
- self.wish_reload = 0;
- W_UZI_Reload();
- }
- }
- }
}
else if (req == WR_PRECACHE)
{