From 2295d9258c1679df62fa56e82e0173294b1df7e5 Mon Sep 17 00:00:00 2001 From: savagex Date: Wed, 1 Feb 2006 19:55:04 +0000 Subject: [PATCH] change grenade-launcher aiming back to pre-TrueAim(tm) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@942 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/gamec/w_grenadelauncher.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/gamec/w_grenadelauncher.c b/data/qcsrc/server/gamec/w_grenadelauncher.c index d05c112db..8654b40d7 100644 --- a/data/qcsrc/server/gamec/w_grenadelauncher.c +++ b/data/qcsrc/server/gamec/w_grenadelauncher.c @@ -65,9 +65,6 @@ void W_Grenade_Attack (void) local vector org; - local vector trueaim; - trueaim = W_TrueAim(); - sound (self, CHAN_WEAPON, "weapons/grenade_fire.ogg", 1, ATTN_NORM); if (self.items & IT_STRENGTH) { sound (self, CHAN_AUTO, "weapons/strength_fire.ogg", 1, ATTN_NORM); @@ -96,7 +93,7 @@ void W_Grenade_Attack (void) gren.health = 10; gren.damageforcescale = 4; gren.event_damage = W_Grenade_Damage; - gren.velocity = normalize(trueaim - org) * cvar("g_balance_grenadelauncher_speed2") + v_up * cvar("g_balance_grenadelauncher_speed2_up"); + gren.velocity = v_forward * cvar("g_balance_grenadelauncher_speed2") + v_up * cvar("g_balance_grenadelauncher_speed2_up"); gren.avelocity = '100 150 100'; } else @@ -104,7 +101,7 @@ void W_Grenade_Attack (void) gren.nextthink = time + 30; gren.think = W_Grenade_Explode; gren.touch = W_Grenade_Explode; - gren.velocity = normalize(trueaim - org) * cvar("g_balance_grenadelauncher_speed") + v_up * cvar("g_balance_grenadelauncher_speed_up"); + gren.velocity = v_forward * cvar("g_balance_grenadelauncher_speed") + v_up * cvar("g_balance_grenadelauncher_speed_up"); gren.avelocity_x = random () * -500 - 500; } -- 2.39.2