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

g_weaponarena_random_with_blaster
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index d855c8480..0e3cee2e6 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -416,7 +416,7 @@ set g_use_ammunition 1 "if set to 0 all weapons have unlimited ammunition"
 set g_pickup_items -1 "if set to 0 all items (health, armor, ammo, weapons...) are removed from the map, if 1 they are forced to spawn"
 set g_weaponarena "0"	"put in a list of weapons to enable a weapon arena mode, or try \"all\" or \"most\""
 set g_weaponarena_random "0"	"if set to a number, only that weapon count is given on every spawn (randomly)"
-set g_weaponarena_random_with_laser "1"	"additionally, always provide the laser in random weapon arena games"
+set g_weaponarena_random_with_blaster "1"	"additionally, always provide the blaster in random weapon arena games"
 set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
 set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
 set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid"
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 17eaa6936..1fb4655ee 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -462,10 +462,10 @@ void PutClientInServer (void)
 
 		if(g_weaponarena_random) // WEAPONTODO: more stuff that should be in a mutator. also: rename those cvars
 		{
-			if(g_weaponarena_random_with_laser)
+			if(g_weaponarena_random_with_blaster)
 				self.weapons &= ~WEPSET_BLASTER;
 			W_RandomWeapons(self, g_weaponarena_random);
-			if(g_weaponarena_random_with_laser)
+			if(g_weaponarena_random_with_blaster)
 				self.weapons |= WEPSET_BLASTER;
 		}
 
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 93bb5799f..880683d3f 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -115,7 +115,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 		else if(!(attacker.weapons & WepSet_FromWeapon(culprit)))
 			culprit = attacker.weapon;
 
-		if(g_weaponarena_random_with_laser && culprit == WEP_BLASTER) // WEAPONTODO: Shouldn't this be in a mutator?
+		if(g_weaponarena_random_with_blaster && culprit == WEP_BLASTER) // WEAPONTODO: Shouldn't this be in a mutator?
 		{
 			// no exchange
 		}
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index fc2fc0cad..2df6a50d4 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -597,7 +597,7 @@ float g_pickup_weapons_anyway;
 float g_weaponarena;
 WepSet g_weaponarena_weapons;
 float g_weaponarena_random;
-float g_weaponarena_random_with_laser;
+float g_weaponarena_random_with_blaster;
 string g_weaponarena_list;
 float g_weaponspeedfactor;
 float g_weaponratefactor;
@@ -769,7 +769,7 @@ void readplayerstartcvars()
 		g_weaponarena_random = cvar("g_weaponarena_random");
 	else
 		g_weaponarena_random = 0;
-	g_weaponarena_random_with_laser = cvar("g_weaponarena_random_with_laser");
+	g_weaponarena_random_with_blaster = cvar("g_weaponarena_random_with_blaster");
 
 	if (g_weaponarena)
 	{