From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 21 Jul 2010 04:32:43 +0000 (+0200)
Subject: restore velocity of grenades before exploding
X-Git-Tag: xonotic-v0.1.0preview~423^2~26^2~3^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2f60269d37f4978a73e78918e8d66e600130d2ce;p=xonotic%2Fxonotic-data.pk3dir.git

restore velocity of grenades before exploding
---

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 551acf359..f6851af21 100644
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -13,6 +13,10 @@ void W_Grenade_Explode (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_primary_damage"), cvar("g_balance_grenadelauncher_primary_edgedamage"), cvar("g_balance_grenadelauncher_primary_radius"), world, cvar("g_balance_grenadelauncher_primary_force"), self.projectiledeathtype, other);
 
 	remove (self);
@@ -52,6 +56,7 @@ void W_Grenade_Touch1 (void)
 		spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM);
 
 		// let it stick whereever it is
+		self.oldvelocity = self.velocity;
 		self.velocity = '0 0 0';
 		self.movetype = MOVETYPE_NONE; // also disables gravity
 		self.gravity = 0; // nope, it does NOT! maybe a bug in CSQC code? TODO