From 2b9fb683c4b7b4becc9d03f059ba69d65acd1fdc Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 23 Feb 2009 15:38:30 +0000 Subject: [PATCH] WFRAME_FIRE2 git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5935 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/w_campingrifle.qc | 2 +- data/qcsrc/server/w_electro.qc | 2 +- data/qcsrc/server/w_hagar.qc | 2 +- data/qcsrc/server/w_hook.qc | 2 +- data/qcsrc/server/w_laser.qc | 2 +- data/qcsrc/server/w_seeker.qc | 2 +- data/qcsrc/server/w_shotgun.qc | 6 +++--- data/qcsrc/server/w_uzi.qc | 10 +++++----- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/qcsrc/server/w_campingrifle.qc b/data/qcsrc/server/w_campingrifle.qc index 4ffa93d43..e717817c4 100644 --- a/data/qcsrc/server/w_campingrifle.qc +++ b/data/qcsrc/server/w_campingrifle.qc @@ -129,7 +129,7 @@ float w_campingrifle(float req) if (weapon_prepareattack(1, cvar("g_balance_campingrifle_secondary_refire"))) { W_Campingrifle_Attack2(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_campingrifle_secondary_animtime"), W_Campingrifle_CheckReloadAndReady); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_campingrifle_secondary_animtime"), W_Campingrifle_CheckReloadAndReady); } } } diff --git a/data/qcsrc/server/w_electro.qc b/data/qcsrc/server/w_electro.qc index 7d47c8b41..939d9453a 100644 --- a/data/qcsrc/server/w_electro.qc +++ b/data/qcsrc/server/w_electro.qc @@ -192,7 +192,7 @@ float w_electro(float req) if (weapon_prepareattack(1, cvar("g_balance_electro_secondary_refire"))) { W_Electro_Attack2(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_secondary_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_electro_secondary_animtime"), w_ready); } } else if (req == WR_PRECACHE) diff --git a/data/qcsrc/server/w_hagar.qc b/data/qcsrc/server/w_hagar.qc index 2de784cbc..59a7248a3 100644 --- a/data/qcsrc/server/w_hagar.qc +++ b/data/qcsrc/server/w_hagar.qc @@ -149,7 +149,7 @@ float w_hagar(float req) if (weapon_prepareattack(1, cvar("g_balance_hagar_secondary_refire"))) { W_Hagar_Attack2(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hagar_secondary_refire"), w_ready); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_hagar_secondary_refire"), w_ready); } } else if (req == WR_PRECACHE) diff --git a/data/qcsrc/server/w_hook.qc b/data/qcsrc/server/w_hook.qc index 708714392..d200f354a 100644 --- a/data/qcsrc/server/w_hook.qc +++ b/data/qcsrc/server/w_hook.qc @@ -130,7 +130,7 @@ float w_hook(float req) if (weapon_prepareattack(1, cvar("g_balance_hook_secondary_refire"))) { W_Hook_Attack2(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hook_secondary_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_hook_secondary_animtime"), w_ready); } } diff --git a/data/qcsrc/server/w_laser.qc b/data/qcsrc/server/w_laser.qc index 00dad5f32..c87b5c3ff 100644 --- a/data/qcsrc/server/w_laser.qc +++ b/data/qcsrc/server/w_laser.qc @@ -96,7 +96,7 @@ float w_laser(float req) if (weapon_prepareattack(0, cvar("g_balance_laser_secondary_refire"))) { W_Laser_Attack(TRUE); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_secondary_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_laser_secondary_animtime"), w_ready); } } else diff --git a/data/qcsrc/server/w_seeker.qc b/data/qcsrc/server/w_seeker.qc index 03078d403..43825791d 100644 --- a/data/qcsrc/server/w_seeker.qc +++ b/data/qcsrc/server/w_seeker.qc @@ -438,7 +438,7 @@ float w_seeker(float req) if (weapon_prepareattack(1, cvar("g_balance_seeker_flac_refire"))) { Seeker_Fire_Flac(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_seeker_flac_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_seeker_flac_animtime"), w_ready); } } diff --git a/data/qcsrc/server/w_shotgun.qc b/data/qcsrc/server/w_shotgun.qc index fda9556ab..75461ca0c 100644 --- a/data/qcsrc/server/w_shotgun.qc +++ b/data/qcsrc/server/w_shotgun.qc @@ -94,12 +94,12 @@ void W_Shotgun_Attack2 (void) void shotgun_fire2_03() { W_Shotgun_Attack2(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), w_ready); } void shotgun_fire2_02() { W_Shotgun_Attack2(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_03); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_03); } void spawnfunc_weapon_shotgun(); // defined in t_items.qc @@ -123,7 +123,7 @@ float w_shotgun(float req) if (weapon_prepareattack(1, cvar("g_balance_shotgun_secondary_refire"))) { W_Shotgun_Attack2(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_02); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_02); } } else if (req == WR_PRECACHE) diff --git a/data/qcsrc/server/w_uzi.qc b/data/qcsrc/server/w_uzi.qc index 04b6db3ff..27942d323 100644 --- a/data/qcsrc/server/w_uzi.qc +++ b/data/qcsrc/server/w_uzi.qc @@ -109,18 +109,18 @@ float w_uzi(float req) else if (req == WR_THINK) { if (self.BUTTON_ATCK) - if (weapon_prepareattack(0, cvar("g_balance_uzi_refire"))) + if (weapon_prepareattack(0, 0)) { self.uzi_bulletcounter = 1; - W_Uzi_Attack(WEP_UZI); + W_Uzi_Attack(WEP_UZI); // sets attack_finished weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_uzi_sustained_refire"), uzi_fire1_02); } if (self.BUTTON_ATCK2) - if (weapon_prepareattack(1, cvar("g_balance_uzi_refire"))) + if (weapon_prepareattack(1, 0)) { self.uzi_bulletcounter = 1; - W_Uzi_Attack(WEP_UZI | HITTYPE_SECONDARY); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_uzi_sustained_refire"), w_ready); + W_Uzi_Attack(WEP_UZI | HITTYPE_SECONDARY); // sets attack_finished + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_uzi_first_refire"), w_ready); } } else if (req == WR_PRECACHE) -- 2.39.2