From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 04:53:34 +0000 (+1100)
Subject: Rename an old cvar
X-Git-Tag: xonotic-v0.8.0~122^2~34
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0784c425a126c2309bf3ba1275ce9cc4b037ff22;p=xonotic%2Fxonotic-data.pk3dir.git

Rename an old cvar
---

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 7d85532ba..7ccb8968f 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -973,8 +973,8 @@ void Ent_Init()
 
 	armorblockpercent = ReadByte() / 255.0;
 
-	g_balance_grenadelauncher_bouncefactor = ReadCoord();
-	g_balance_grenadelauncher_bouncestop = ReadCoord();
+	g_balance_mortar_bouncefactor = ReadCoord();
+	g_balance_mortar_bouncestop = ReadCoord();
 	g_balance_electro_secondary_bouncefactor = ReadCoord();
 	g_balance_electro_secondary_bouncestop = ReadCoord();
 
diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 815c20a33..2cf9a2a34 100644
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -136,8 +136,8 @@ float calledhooks;
 
 .float ping, ping_packetloss, ping_movementloss;
 
-float g_balance_grenadelauncher_bouncefactor;
-float g_balance_grenadelauncher_bouncestop;
+float g_balance_mortar_bouncefactor;
+float g_balance_mortar_bouncestop;
 float g_balance_electro_secondary_bouncefactor;
 float g_balance_electro_secondary_bouncestop;
 float g_trueaim_minrange;
diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 58bd11ee4..fc769408b 100644
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -348,8 +348,8 @@ void Ent_Projectile()
 				self.maxs = '3 3 3';
 				self.move_movetype = MOVETYPE_BOUNCE;
 				self.move_touch = func_null;
-				self.move_bounce_factor = g_balance_grenadelauncher_bouncefactor;
-				self.move_bounce_stopspeed = g_balance_grenadelauncher_bouncestop;
+				self.move_bounce_factor = g_balance_mortar_bouncefactor;
+				self.move_bounce_stopspeed = g_balance_mortar_bouncestop;
 				break;
 			case PROJECTILE_SHAMBLER_LIGHTNING:
 				self.mins = '-8 -8 -8';