From: Mario <mario.mario@y7mail.com>
Date: Tue, 28 May 2013 06:24:00 +0000 (+1000)
Subject: Add cvars for the custom rifle balance in riflearena mode
X-Git-Tag: xonotic-v0.8.0~366^2~23^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc290b38c89cc6e01d046dca8212012ab1b71e4d;p=xonotic%2Fxonotic-data.pk3dir.git

Add cvars for the custom rifle balance in riflearena mode
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 533e2546c..09e3d1852 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1613,3 +1613,8 @@ set g_riflearena_nade_newton_style 0
 set g_riflearena_nade_minforce 400
 set g_riflearena_nade_maxforce 2000
 set g_riflearena_nade_refire 6
+set g_riflearena_rifle_secondary_spread 0
+set g_riflearena_rifle_secondary_shots 1
+set g_riflearena_rifle_secondary_animtime 0.15
+set g_riflearena_rifle_secondary_refire 0.15
+set g_riflearena_rifle_secondary_damage 40
diff --git a/qcsrc/server/mutators/mutator_riflearena.qc b/qcsrc/server/mutators/mutator_riflearena.qc
index 7ad0ff6cb..540f70d35 100644
--- a/qcsrc/server/mutators/mutator_riflearena.qc
+++ b/qcsrc/server/mutators/mutator_riflearena.qc
@@ -188,6 +188,15 @@ void ra_nade_prime()
 	self.ra_nade.projectiledeathtype = DEATH_NADE_NORMAL;
 }
 
+void ra_SetCvars()
+{
+	cvar_settemp("g_balance_rifle_secondary_spread", ftos(cvar("g_riflearena_rifle_secondary_spread")));
+	cvar_settemp("g_balance_rifle_secondary_shots", ftos(cvar("g_riflearena_rifle_secondary_shots")));
+	cvar_settemp("g_balance_rifle_secondary_animtime", ftos(cvar("g_riflearena_rifle_secondary_animtime")));
+	cvar_settemp("g_balance_rifle_secondary_refire", ftos(cvar("g_riflearena_rifle_secondary_refire")));
+	cvar_settemp("g_balance_rifle_secondary_damage", ftos(cvar("g_riflearena_rifle_secondary_damage")));
+}
+
 MUTATOR_HOOKFUNCTION(ra_VehicleEnter)
 {
 	if(other.ra_nade)
@@ -363,11 +372,8 @@ MUTATOR_DEFINITION(mutator_riflearena)
 	
 	MUTATOR_ONADD
 	{
-		cvar_settemp("g_balance_rifle_secondary_spread", "0");
-		cvar_settemp("g_balance_rifle_secondary_shots", "1");
-		cvar_settemp("g_balance_rifle_secondary_animtime", "0.15");
-		cvar_settemp("g_balance_rifle_secondary_refire", "0.15");
-		cvar_settemp("g_balance_rifle_secondary_damage", "40");
+		ra_SetCvars();
+		
 		precache_model("models/ok_nade_counter/ok_nade_counter.md3");
 		
 		precache_model("models/weapons/h_ok_grenade.iqm");