Merge branch 'master' into Mario/entrap_nade

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / nix / nix.qc

diff --git a/qcsrc/common/mutators/mutator/nix/nix.qc b/qcsrc/common/mutators/mutator/nix/nix.qc
index 9c1f4bc7ad7cf68842d98d9e929052bf29adb604..f52d75a9e93c769c195d066279cf85c31593701f 100644 (file)
--- a/qcsrc/common/mutators/mutator/nix/nix.qc
+++ b/qcsrc/common/mutators/mutator/nix/nix.qc
@@ -66,6 +66,8 @@ REGISTER_MUTATOR(nix, cvar("g_nix") && !cvar("g_instagib") && !cvar("g_overkill"
                                PS(it).m_switchweapon = w_getbestweapon(it);
                });
        }
+
+       return false;
 }
 
 bool NIX_CanChooseWeapon(int wpn)
@@ -93,7 +95,7 @@ void NIX_ChooseNextWeapon()
        RandomSelection_Init();
        FOREACH(Weapons, it != WEP_Null, LAMBDA(
                if(NIX_CanChooseWeapon(it.m_id))
-                       RandomSelection_Add(world, it.m_id, string_null, 1, (it.m_id != nix_weapon));
+                       RandomSelection_Add(NULL, it.m_id, string_null, 1, (it.m_id != nix_weapon));
        ));
        nix_nextweapon = RandomSelection_chosen_float;
 }
@@ -157,7 +159,7 @@ void NIX_GiveCurrentWeapon(entity this)
                else
                        Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_NIX_NEWWEAPON, nix_weapon);
 
-               WITHSELF(this, e.wr_resetplayer(e, this));
+               e.wr_resetplayer(e, this);
 
                // all weapons must be fully loaded when we spawn
                if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars