From 7cea850c2efc5078574b4aad15866c358e633617 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Wed, 22 Feb 2006 10:32:11 +0000 Subject: [PATCH] fixed weapon firing animations to use check2 functions where appropriate git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1119 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/gamec/w_crylink.c | 2 +- data/qcsrc/server/gamec/w_electro.c | 2 +- data/qcsrc/server/gamec/w_grenadelauncher.c | 2 +- data/qcsrc/server/gamec/w_hagar.c | 2 +- data/qcsrc/server/gamec/w_shotgun.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/qcsrc/server/gamec/w_crylink.c b/data/qcsrc/server/gamec/w_crylink.c index a3671831b..e2faededb 100644 --- a/data/qcsrc/server/gamec/w_crylink.c +++ b/data/qcsrc/server/gamec/w_crylink.c @@ -204,7 +204,7 @@ void() crylink_fire1_01 = }; void() crylink_fire2_01 = { - weapon_doattack(crylink_check, crylink_check, W_Crylink_Attack2); + weapon_doattack(crylink_check2, crylink_check2, W_Crylink_Attack2); weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_crylink_secondary_animtime"), crylink_ready_01); }; diff --git a/data/qcsrc/server/gamec/w_electro.c b/data/qcsrc/server/gamec/w_electro.c index cbc48372c..5d17913b1 100644 --- a/data/qcsrc/server/gamec/w_electro.c +++ b/data/qcsrc/server/gamec/w_electro.c @@ -25,7 +25,7 @@ void(float req) w_electro = else if (req == WR_FIRE1) weapon_prepareattack(electro_check, electro_check, electro_fire1_01, cvar("g_balance_electro_primary_refire")); else if (req == WR_FIRE2) - weapon_prepareattack(electro_check, electro_check, electro_fire2_01, cvar("g_balance_electro_secondary_refire")); + weapon_prepareattack(electro_check2, electro_check2, electro_fire2_01, cvar("g_balance_electro_secondary_refire")); else if (req == WR_RAISE) electro_select_01(); else if (req == WR_UPDATECOUNTS) diff --git a/data/qcsrc/server/gamec/w_grenadelauncher.c b/data/qcsrc/server/gamec/w_grenadelauncher.c index ece135983..c131c9095 100644 --- a/data/qcsrc/server/gamec/w_grenadelauncher.c +++ b/data/qcsrc/server/gamec/w_grenadelauncher.c @@ -170,6 +170,6 @@ void() glauncher_fire1_01 = }; void() glauncher_fire2_01 = { - weapon_doattack(glauncher_check, glauncher_check, W_Grenade_Attack2); + weapon_doattack(glauncher_check2, glauncher_check2, W_Grenade_Attack2); weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grenadelauncher_secondary_animtime"), glauncher_ready_01); }; diff --git a/data/qcsrc/server/gamec/w_hagar.c b/data/qcsrc/server/gamec/w_hagar.c index df8f5facf..219454553 100644 --- a/data/qcsrc/server/gamec/w_hagar.c +++ b/data/qcsrc/server/gamec/w_hagar.c @@ -198,7 +198,7 @@ void() hagar_fire1_01 = void() hagar_fire2_01 = { self.attack_finished = time + cvar("g_balance_hagar_secondary_refire"); - weapon_doattack(hagar_check, hagar_check, W_Hagar_Attack2); + weapon_doattack(hagar_check2, hagar_check2, W_Hagar_Attack2); weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hagar_secondary_refire"), hagar_ready_01); }; diff --git a/data/qcsrc/server/gamec/w_shotgun.c b/data/qcsrc/server/gamec/w_shotgun.c index 4ecc87a74..54437c499 100644 --- a/data/qcsrc/server/gamec/w_shotgun.c +++ b/data/qcsrc/server/gamec/w_shotgun.c @@ -130,16 +130,16 @@ void() shotgun_fire1_01 = }; void() shotgun_fire2_03 = { - weapon_doattack(shotgun_check, shotgun_check, W_Shotgun_Attack2); + weapon_doattack(shotgun_check2, shotgun_check2, W_Shotgun_Attack2); weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_ready_01); } void() shotgun_fire2_02 = { - weapon_doattack(shotgun_check, shotgun_check, W_Shotgun_Attack2); + weapon_doattack(shotgun_check2, shotgun_check2, W_Shotgun_Attack2); weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_03); } void() shotgun_fire2_01 = { - weapon_doattack(shotgun_check, shotgun_check, W_Shotgun_Attack2); + weapon_doattack(shotgun_check2, shotgun_check2, W_Shotgun_Attack2); weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_02); } -- 2.39.2