Rename nex to vortex

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_nix.qc

diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index 70357067e466c6ee429e133f06347c0917a8395a..4aa7e44d5b2356a60bf2c06ae6742dffe3236f62 100644 (file)
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -22,7 +22,7 @@ float NIX_CanChooseWeapon(float wpn)
        }
        else
        {
-               if(wpn == WEP_LASER && g_nix_with_laser)
+               if(wpn == WEP_BLASTER && g_nix_with_laser) // WEAPONTODO: rename to g_nix_with_blaster
                        return FALSE;
                if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
                        return FALSE;
@@ -107,11 +107,11 @@ void NIX_GiveCurrentWeapon()
                        self.(weapon_load[nix_weapon]) = e.reloading_ammo;
 
                // nex too
-               if(WEP_CVAR(nex, charge))
+               if(WEP_CVAR(vortex, charge))
                {
-                       if(WEP_CVAR_SEC(nex, chargepool))
-                               self.nex_chargepool_ammo = 1;
-                       self.nex_charge = WEP_CVAR(nex, charge_start);
+                       if(WEP_CVAR_SEC(vortex, chargepool))
+                               self.vortex_chargepool_ammo = 1;
+                       self.vortex_charge = WEP_CVAR(vortex, charge_start);
                }
        }
        if(self.nix_lastinfotime != dt)
@@ -138,7 +138,7 @@ void NIX_GiveCurrentWeapon()
 
        self.weapons = '0 0 0';
        if(g_nix_with_laser)
-               self.weapons &= ~WEPSET_LASER;
+               self.weapons &= ~WEPSET_BLASTER;
        self.weapons |= WepSet_FromWeapon(nix_weapon);
 
        if(self.switchweapon != nix_weapon)