From 061a422c134fb7d2180bc32879abb80a302ea284 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 26 Aug 2010 07:33:35 +0200 Subject: [PATCH] give grenades a size too (6x6x6) like rockets; fix visual issue with grenade explosion appearing on the wrong side of a wall --- qcsrc/client/interpolate.qc | 3 ++- qcsrc/client/projectile.qc | 11 ++++++----- qcsrc/server/w_grenadelauncher.qc | 10 +++++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/qcsrc/client/interpolate.qc b/qcsrc/client/interpolate.qc index 5593570508..5ee28b0fd2 100644 --- a/qcsrc/client/interpolate.qc +++ b/qcsrc/client/interpolate.qc @@ -24,7 +24,8 @@ void InterpolateOrigin_Note() self.iorigin2 = self.origin; if(self.iflags & IFLAG_AUTOANGLES) - self.angles = vectoangles(self.iorigin2 - self.iorigin1); + if(self.iorigin2 != self.iorigin1) + self.angles = vectoangles(self.iorigin2 - self.iorigin1); if(self.iflags & IFLAG_ANGLES) { diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc index 407b86c746..9a773379b5 100644 --- a/qcsrc/client/projectile.qc +++ b/qcsrc/client/projectile.qc @@ -72,7 +72,8 @@ void Projectile_Draw() else Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy); if(!(self.move_flags & FL_ONGROUND)) - self.angles = vectoangles(self.velocity); + if(self.velocity != '0 0 0') + self.angles = vectoangles(self.velocity); } else { @@ -318,12 +319,12 @@ void Ent_Projectile() self.maxs = '3 3 3'; break; case PROJECTILE_GRENADE: - self.mins = '0 0 -3'; - self.maxs = '0 0 -3'; + self.mins = '-3 -3 -3'; + self.maxs = '3 3 3'; break; case PROJECTILE_GRENADE_BOUNCING: - self.mins = '0 0 -3'; - self.maxs = '0 0 -3'; + self.mins = '-3 -3 -3'; + self.maxs = '3 3 3'; self.move_movetype = MOVETYPE_BOUNCE; self.move_touch = SUB_Null; self.move_bounce_factor = g_balance_grenadelauncher_secondary_bouncefactor; diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 6848b2a5ad..64a987047c 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -32,6 +32,10 @@ void W_Grenade_Explode2 (void) self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; + + if(self.movetype == MOVETYPE_NONE) + self.velocity = self.oldvelocity; + RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_secondary_damage"), cvar("g_balance_grenadelauncher_secondary_edgedamage"), cvar("g_balance_grenadelauncher_secondary_radius"), world, cvar("g_balance_grenadelauncher_secondary_force"), self.projectiledeathtype, other); remove (self); @@ -123,7 +127,7 @@ void W_Grenade_Attack (void) if not(self.items & IT_UNLIMITED_WEAPON_AMMO) self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_primary_ammo"); - W_SetupShot_ProjectileSize (self, '0 0 -3', '0 0 -3', FALSE, 4, "weapons/grenade_fire.wav", cvar("g_balance_grenadelauncher_primary_damage")); + W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 4, "weapons/grenade_fire.wav", cvar("g_balance_grenadelauncher_primary_damage")); w_shotdir = v_forward; // no TrueAim for grenades please pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); @@ -137,7 +141,7 @@ void W_Grenade_Attack (void) PROJECTILE_MAKETRIGGER(gren); gren.projectiledeathtype = WEP_GRENADE_LAUNCHER; setorigin(gren, w_shotorg); - setsize(gren, '0 0 -3', '0 0 -3'); + setsize(gren, '-3 -3 -3', '3 3 3'); gren.nextthink = time + cvar("g_balance_grenadelauncher_primary_lifetime"); gren.think = adaptor_think2use_hittype_splash; @@ -177,7 +181,7 @@ void W_Grenade_Attack2 (void) PROJECTILE_MAKETRIGGER(gren); gren.projectiledeathtype = WEP_GRENADE_LAUNCHER | HITTYPE_SECONDARY; setorigin(gren, w_shotorg); - setsize(gren, '0 0 -3', '0 0 -3'); + setsize(gren, '-3 -3 -3', '3 3 3'); gren.nextthink = time + cvar("g_balance_grenadelauncher_secondary_lifetime"); gren.think = adaptor_think2use_hittype_splash; -- 2.39.2