From: Samual Lenks Date: Tue, 20 Aug 2013 18:25:26 +0000 (-0400) Subject: Remove some reloading system stupidity X-Git-Tag: xonotic-v0.8.0~152^2~329 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf4db4c8c9303a20f08fa2a25db1dad5686fb92b;p=xonotic%2Fxonotic-data.pk3dir.git Remove some reloading system stupidity --- diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc index 5b7946ce5..f5cb9f772 100644 --- a/qcsrc/common/weapons/w_blaster.qc +++ b/qcsrc/common/weapons/w_blaster.qc @@ -525,7 +525,7 @@ float W_Laser(float request) case WR_RELOAD: { - W_Reload(0, autocvar_g_balance_laser_reload_ammo, autocvar_g_balance_laser_reload_time, "weapons/reload.wav"); + W_Reload(0, "weapons/reload.wav"); return TRUE; } diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index 0e68bc9bf..12320a850 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -660,7 +660,7 @@ float w_crylink(float req) } case WR_RELOAD: { - W_Reload(min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo), autocvar_g_balance_crylink_reload_ammo, autocvar_g_balance_crylink_reload_time, "weapons/reload.wav"); + W_Reload(min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo), "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc index d3497bb7c..46f4384dd 100644 --- a/qcsrc/common/weapons/w_devastator.qc +++ b/qcsrc/common/weapons/w_devastator.qc @@ -506,7 +506,7 @@ float W_Devastator(float req) } case WR_RELOAD: { - W_Reload(WEP_CVAR(devastator, ammo), WEP_CVAR(devastator, reload_ammo), WEP_CVAR(devastator, reload_time), "weapons/reload.wav"); + W_Reload(WEP_CVAR(devastator, ammo), "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc index 9947da1f5..14ae101cd 100644 --- a/qcsrc/common/weapons/w_electro.qc +++ b/qcsrc/common/weapons/w_electro.qc @@ -563,7 +563,7 @@ float w_electro(float req) } case WR_RELOAD: { - W_Reload(min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo), autocvar_g_balance_electro_reload_ammo, autocvar_g_balance_electro_reload_time, "weapons/reload.wav"); + W_Reload(min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo), "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc index 1916b5697..7e08c1a3b 100644 --- a/qcsrc/common/weapons/w_hagar.qc +++ b/qcsrc/common/weapons/w_hagar.qc @@ -491,7 +491,7 @@ float w_hagar(float req) case WR_RELOAD: { if not(self.hagar_load) // require releasing loaded rockets first - W_Reload(min(WEP_CVAR_PRI(hagar, ammo), WEP_CVAR_SEC(hagar, ammo)), autocvar_g_balance_hagar_reload_ammo, autocvar_g_balance_hagar_reload_time, "weapons/reload.wav"); + W_Reload(min(WEP_CVAR_PRI(hagar, ammo), WEP_CVAR_SEC(hagar, ammo)), "weapons/reload.wav"); return TRUE; } diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc index ed99847e9..097be0872 100644 --- a/qcsrc/common/weapons/w_hlac.qc +++ b/qcsrc/common/weapons/w_hlac.qc @@ -262,7 +262,7 @@ float w_hlac(float req) } case WR_RELOAD: { - W_Reload(min(WEP_CVAR_PRI(hlac, ammo), WEP_CVAR_SEC(hlac, ammo)), autocvar_g_balance_hlac_reload_ammo, autocvar_g_balance_hlac_reload_time, "weapons/reload.wav"); + W_Reload(min(WEP_CVAR_PRI(hlac, ammo), WEP_CVAR_SEC(hlac, ammo)), "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc index a6f320a08..2d8ea145c 100644 --- a/qcsrc/common/weapons/w_machinegun.qc +++ b/qcsrc/common/weapons/w_machinegun.qc @@ -351,8 +351,7 @@ float w_uzi(float req) } case WR_RELOAD: { - entity weapon = get_weaponinfo(WEP_UZI); - W_Reload(min(max(WEP_CVAR(uzi, sustained_ammo), WEP_CVAR(uzi, first_ammo)), WEP_CVAR(uzi, burst_ammo)), weapon.reloading_ammo, weapon.reloading_time, "weapons/reload.wav"); + W_Reload(min(max(WEP_CVAR(uzi, sustained_ammo), WEP_CVAR(uzi, first_ammo)), WEP_CVAR(uzi, burst_ammo)), "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc index 8ac784f0b..06ff4ee0a 100644 --- a/qcsrc/common/weapons/w_minelayer.qc +++ b/qcsrc/common/weapons/w_minelayer.qc @@ -569,7 +569,7 @@ float w_minelayer(float req) } case WR_RELOAD: { - W_Reload(WEP_CVAR(minelayer, ammo), autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav"); + W_Reload(WEP_CVAR(minelayer, ammo), "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_minstanex.qc b/qcsrc/common/weapons/w_minstanex.qc index b218dc294..b7adc5207 100644 --- a/qcsrc/common/weapons/w_minstanex.qc +++ b/qcsrc/common/weapons/w_minstanex.qc @@ -188,7 +188,7 @@ float w_minstanex(float req) else used_ammo = minstanex_ammo; - W_Reload(used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav"); + W_Reload(used_ammo, "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc index fa9aae390..712944ec0 100644 --- a/qcsrc/common/weapons/w_mortar.qc +++ b/qcsrc/common/weapons/w_mortar.qc @@ -429,7 +429,7 @@ float w_glauncher(float req) } case WR_RELOAD: { - W_Reload(min(WEP_CVAR_PRI(mortar, ammo), WEP_CVAR_SEC(mortar, ammo)), autocvar_g_balance_mortar_reload_ammo, autocvar_g_balance_mortar_reload_time, "weapons/reload.wav"); // WEAPONTODO + W_Reload(min(WEP_CVAR_PRI(mortar, ammo), WEP_CVAR_SEC(mortar, ammo)), "weapons/reload.wav"); // WEAPONTODO return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc index 26c951064..6b5f4a2ff 100644 --- a/qcsrc/common/weapons/w_nex.qc +++ b/qcsrc/common/weapons/w_nex.qc @@ -276,7 +276,7 @@ float w_nex(float req) } case WR_RELOAD: { - W_Reload(min(WEP_CVAR_PRI(nex, ammo), WEP_CVAR_SEC(nex, ammo)), autocvar_g_balance_nex_reload_ammo, autocvar_g_balance_nex_reload_time, "weapons/reload.wav"); + W_Reload(min(WEP_CVAR_PRI(nex, ammo), WEP_CVAR_SEC(nex, ammo)), "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc index b984c804c..76cf93962 100644 --- a/qcsrc/common/weapons/w_rifle.qc +++ b/qcsrc/common/weapons/w_rifle.qc @@ -234,7 +234,7 @@ float w_rifle(float req) } case WR_RELOAD: { - W_Reload(min(WEP_CVAR_PRI(rifle, ammo), WEP_CVAR_SEC(rifle, ammo)), autocvar_g_balance_rifle_reload_ammo, autocvar_g_balance_rifle_reload_time, "weapons/reload.wav"); + W_Reload(min(WEP_CVAR_PRI(rifle, ammo), WEP_CVAR_SEC(rifle, ammo)), "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc index 52d9931cb..55ad43459 100644 --- a/qcsrc/common/weapons/w_seeker.qc +++ b/qcsrc/common/weapons/w_seeker.qc @@ -696,7 +696,7 @@ float w_seeker(float req) } case WR_RELOAD: { - W_Reload(min(WEP_CVAR(seeker, missile_ammo), WEP_CVAR(seeker, tag_ammo)), autocvar_g_balance_seeker_reload_ammo, autocvar_g_balance_seeker_reload_time, "weapons/reload.wav"); + W_Reload(min(WEP_CVAR(seeker, missile_ammo), WEP_CVAR(seeker, tag_ammo)), "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc index bc47f7bc3..333a9ffaf 100644 --- a/qcsrc/common/weapons/w_shockwave.qc +++ b/qcsrc/common/weapons/w_shockwave.qc @@ -265,7 +265,7 @@ float w_shotgun(float req) } case WR_RELOAD: { - W_Reload(autocvar_g_balance_shotgun_primary_ammo, autocvar_g_balance_shotgun_reload_ammo, autocvar_g_balance_shotgun_reload_time, "weapons/reload.wav"); + W_Reload(autocvar_g_balance_shotgun_primary_ammo, "weapons/reload.wav"); return TRUE; } case WR_SUICIDEMESSAGE: diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 89d244bcc..eb31d7b9a 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -88,7 +88,6 @@ float autocvar_g_balance_armor_rotlinear; float autocvar_g_balance_armor_rotstable; float autocvar_g_balance_armor_start; float autocvar_g_balance_rifle_reload_ammo; -float autocvar_g_balance_rifle_reload_time; float autocvar_g_balance_cloaked_alpha; float autocvar_g_balance_contents_damagerate; float autocvar_g_balance_contents_drowndelay; @@ -98,7 +97,6 @@ float autocvar_g_balance_contents_playerdamage_slime; float autocvar_g_balance_contents_projectiledamage; float autocvar_g_balance_crylink_secondary; float autocvar_g_balance_crylink_reload_ammo; -float autocvar_g_balance_crylink_reload_time; float autocvar_g_balance_damagepush_speedfactor; float autocvar_g_balance_electro_combo_comboradius; float autocvar_g_balance_electro_combo_damage; @@ -140,7 +138,6 @@ float autocvar_g_balance_electro_secondary_refire; float autocvar_g_balance_electro_secondary_refire2; float autocvar_g_balance_electro_secondary_speed; float autocvar_g_balance_electro_reload_ammo; -float autocvar_g_balance_electro_reload_time; float autocvar_g_balance_falldamage_deadminspeed; float autocvar_g_balance_falldamage_factor; float autocvar_g_balance_falldamage_maxdamage; @@ -164,7 +161,6 @@ float autocvar_g_balance_grapplehook_speed_pull; float autocvar_g_balance_grapplehook_stretch; float autocvar_g_balance_grapplehook_damagedbycontents; float autocvar_g_balance_hagar_reload_ammo; -float autocvar_g_balance_hagar_reload_time; float autocvar_g_balance_health_limit; float autocvar_g_balance_health_regen; float autocvar_g_balance_health_regenlinear; @@ -174,7 +170,6 @@ float autocvar_g_balance_health_rotlinear; float autocvar_g_balance_health_rotstable; float autocvar_g_balance_health_start; float autocvar_g_balance_hlac_reload_ammo; -float autocvar_g_balance_hlac_reload_time; float autocvar_g_balance_keyhunt_damageforcescale; float autocvar_g_balance_keyhunt_delay_collect; float autocvar_g_balance_keyhunt_delay_return; @@ -221,7 +216,6 @@ float autocvar_g_balance_laser_primary_shotangle; float autocvar_g_balance_laser_primary_speed; //float autocvar_g_balance_laser_primary_spread; float autocvar_g_balance_laser_reload_ammo; -float autocvar_g_balance_laser_reload_time; float autocvar_g_balance_laser_secondary; float autocvar_g_balance_laser_secondary_animtime; float autocvar_g_balance_laser_secondary_damage; @@ -263,7 +257,6 @@ float autocvar_g_balance_laser_shockwave_splash_radius; float autocvar_g_balance_laser_shockwave_spread_max; float autocvar_g_balance_laser_shockwave_spread_min; float autocvar_g_balance_minelayer_reload_ammo; -float autocvar_g_balance_minelayer_reload_time; float autocvar_g_balance_minstanex_ammo; float autocvar_g_balance_minstanex_laser_ammo; float autocvar_g_balance_minstanex_laser_animtime; @@ -271,9 +264,7 @@ float autocvar_g_balance_minstanex_laser_refire; float autocvar_g_balance_minstanex_animtime; float autocvar_g_balance_minstanex_refire; float autocvar_g_balance_minstanex_reload_ammo; -float autocvar_g_balance_minstanex_reload_time; float autocvar_g_balance_nex_reload_ammo; -float autocvar_g_balance_nex_reload_time; float autocvar_g_balance_nexball_primary_animtime; float autocvar_g_balance_nexball_primary_refire; float autocvar_g_balance_nexball_primary_speed; @@ -314,7 +305,6 @@ float autocvar_g_balance_powerup_strength_selfforce; float autocvar_g_balance_powerup_strength_time; float autocvar_g_balance_superweapons_time; float autocvar_g_balance_seeker_reload_ammo; -float autocvar_g_balance_seeker_reload_time; float autocvar_g_balance_selfdamagepercent; float autocvar_g_balance_shotgun_primary_ammo; float autocvar_g_balance_shotgun_primary_animtime; @@ -340,12 +330,10 @@ float autocvar_g_balance_shotgun_secondary_melee_nonplayerdamage; float autocvar_g_balance_shotgun_secondary_melee_multihit; float autocvar_g_balance_shotgun_secondary_refire; float autocvar_g_balance_shotgun_reload_ammo; -float autocvar_g_balance_shotgun_reload_time; float autocvar_g_balance_teams; float autocvar_g_balance_teams_prevent_imbalance; float autocvar_g_balance_teams_scorefactor; float autocvar_g_balance_uzi_reload_ammo; -float autocvar_g_balance_uzi_reload_time; float autocvar_g_ballistics_density_corpse; float autocvar_g_ballistics_density_player; float autocvar_g_ballistics_materialconstant; diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index da7815fe7..0d9082703 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -870,20 +870,17 @@ void W_ReloadedAndReady() w_ready(); } -void W_Reload(float sent_ammo_min, float sent_ammo_amount, float sent_time, string sent_sound) +void W_Reload(float sent_ammo_min, string sent_sound) { // set global values to work with + entity e; + e = get_weaponinfo(self.weapon); self.reload_ammo_min = sent_ammo_min; - self.reload_ammo_amount = sent_ammo_amount; - self.reload_time = sent_time; + self.reload_ammo_amount = e.reloading_ammo;; + self.reload_time = e.reloading_time; self.reload_sound = sent_sound; - // check if we meet the necessary conditions to reload - - entity e; - e = get_weaponinfo(self.weapon); - // don't reload weapons that don't have the RELOADABLE flag if not(e.spawnflags & WEP_FLAG_RELOADABLE) { @@ -929,7 +926,7 @@ void W_Reload(float sent_ammo_min, float sent_ammo_amount, float sent_time, stri // now begin the reloading process - sound (self, CH_WEAPON_SINGLE, self.reload_sound, VOL_BASE, ATTN_NORM); + sound(self, CH_WEAPON_SINGLE, self.reload_sound, VOL_BASE, ATTN_NORM); // do not set ATTACK_FINISHED in reload code any more. This causes annoying delays if eg: You start reloading a weapon, // then quickly switch to another weapon and back. Reloading is canceled, but the reload delay is still there,