Merge branch 'master' into terencehill/bot_ai

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

diff --git a/qcsrc/common/mutators/mutator/pinata/sv_pinata.qc b/qcsrc/common/mutators/mutator/pinata/sv_pinata.qc
index ff942db310e4fbf434c725343e091cdab24b39f9..779e562b4a4286235891a56c8e43e43cfd0fb716 100644 (file)
--- a/qcsrc/common/mutators/mutator/pinata/sv_pinata.qc
+++ b/qcsrc/common/mutators/mutator/pinata/sv_pinata.qc
@@ -1,6 +1,7 @@
 #include "sv_pinata.qh"
 
-REGISTER_MUTATOR(pinata, cvar("g_pinata") && !cvar("g_instagib") && !cvar("g_overkill"));
+string autocvar_g_pinata;
+REGISTER_MUTATOR(pinata, expr_evaluate(autocvar_g_pinata) && !MUTATOR_IS_ENABLED(mutator_instagib) && !MUTATOR_IS_ENABLED(ok));
 
 MUTATOR_HOOKFUNCTION(pinata, PlayerDies)
 {
@@ -10,15 +11,15 @@ MUTATOR_HOOKFUNCTION(pinata, PlayerDies)
        {
                .entity weaponentity = weaponentities[slot];
 
-               if(frag_target.(weaponentity).m_weapon == WEP_Null && slot != 0)
+               if(frag_target.(weaponentity).m_weapon == WEP_Null)
                        continue;
 
-               FOREACH(Weapons, it != WEP_Null, LAMBDA(
-                       if(frag_target.weapons & WepSet_FromWeapon(it))
-                       if(frag_target.(weaponentity).m_switchweapon != it)
+               FOREACH(Weapons, it != WEP_Null, {
+                       if(STAT(WEAPONS, frag_target) & WepSet_FromWeapon(it))
+                       if(frag_target.(weaponentity).m_weapon != it)
                        if(W_IsWeaponThrowable(frag_target, it.m_id))
                                W_ThrowNewWeapon(frag_target, it.m_id, false, CENTER_OR_VIEWOFS(frag_target), randomvec() * 175 + '0 0 325', weaponentity);
-               ));
+               });
        }
 
        return true;