From: Mario <zacjardine@y7mail.com>
Date: Tue, 30 Dec 2014 07:13:44 +0000 (+1100)
Subject: Fix blaster in NIX
X-Git-Tag: xonotic-v0.8.0~38
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cf2b9d94a711678b77183fafc44cd47faf621d44;p=xonotic%2Fxonotic-data.pk3dir.git

Fix blaster in NIX
---

diff --git a/mutators.cfg b/mutators.cfg
index 07e276f4b..be5af23f9 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -124,7 +124,7 @@ set g_spawn_near_teammate_ignore_spawnpoint_closetodeath 1 "spawn as close to de
 // at each time, everyone uses the same weapon,
 // and in regular intervals, this weapon is cycled
 set g_nix 0 "No Items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon, and so on"
-set g_nix_with_laser 0 "always carry the laser as an additional weapon in NIX"
+set g_nix_with_blaster 0 "always carry the blaster as an additional weapon in NIX"
 set g_nix_with_healtharmor 0 "when 1, health and armor still show up in NIX"
 set g_nix_with_powerups 0 "when 1, powerups still show up in NIX"
 
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
index 368ac1ca5..a4e052f45 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@ -266,7 +266,7 @@ void XonoticMutatorsDialog_fill(entity me)
 			e.cvarOffValue = "0";
 	me.TR(me);
 		me.TDempty(me, 0.4);
-		me.TD(me, 1, 1.6, e = makeXonoticCheckBox(0, "g_nix_with_laser", _("with laser")));
+		me.TD(me, 1, 1.6, e = makeXonoticCheckBox(0, "g_nix_with_blaster", _("with blaster")));
 			setDependent(e, "g_nix", 1, 1);
 	me.TR(me);
 		me.TDempty(me, 0.2);
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index d3003d7c4..168045bd0 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -426,7 +426,7 @@ float autocvar_g_nick_flood_penalty_red;
 float autocvar_g_nick_flood_penalty_yellow;
 //float autocvar_g_nick_flood_timeout;
 float autocvar_g_nix_with_healtharmor;
-float autocvar_g_nix_with_laser;
+float autocvar_g_nix_with_blaster;
 float autocvar_g_nix_with_powerups;
 float autocvar_g_nodepthtestitems;
 float autocvar_g_nodepthtestplayers;
diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index 26209daa1..6a980af08 100644
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -1,4 +1,4 @@
-float g_nix_with_laser;
+float g_nix_with_blaster;
 // WEAPONTODO
 float nix_weapon;
 float nix_nextchange;
@@ -20,7 +20,7 @@ float NIX_CanChooseWeapon(float wpn)
 	}
 	else
 	{
-		if(wpn == WEP_BLASTER && g_nix_with_laser) // WEAPONTODO: rename to g_nix_with_blaster
+		if(wpn == WEP_BLASTER && g_nix_with_blaster) // WEAPONTODO: rename to g_nix_with_blaster
 			return FALSE;
 		if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
 			return FALSE;
@@ -137,8 +137,8 @@ void NIX_GiveCurrentWeapon()
 	}
 
 	self.weapons = '0 0 0';
-	if(g_nix_with_laser)
-		self.weapons &= ~WEPSET_BLASTER;
+	if(g_nix_with_blaster)
+		self.weapons |= WEPSET_BLASTER;
 	self.weapons |= WepSet_FromWeapon(nix_weapon);
 
 	if(self.switchweapon != nix_weapon)
@@ -239,7 +239,7 @@ MUTATOR_DEFINITION(mutator_nix)
 
 	MUTATOR_ONADD
 	{
-		g_nix_with_laser = autocvar_g_nix_with_laser;
+		g_nix_with_blaster = autocvar_g_nix_with_blaster;
 
 		nix_nextchange = 0;
 		nix_nextweapon = 0;