Merge remote-tracking branch 'origin/Mario/mutator_minstagib'
authorSamual Lenks <samual@xonotic.org>
Fri, 10 May 2013 00:10:03 +0000 (20:10 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 10 May 2013 00:10:03 +0000 (20:10 -0400)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 191bfaede12087b766569d7c665e5ebfd60827a5,8ad4520494ac6184b25f90501ba5291999231a5a..f1651e23dac5777a2b95d6395363e9674daadcbf
@@@ -827,23 -827,9 +827,8 @@@ void readplayerstartcvars(
                g_pinata = 0; // incompatible
                g_weapon_stay = 0; // incompatible
                WEPSET_COPY_AA(start_weapons, g_weaponarena_weapons);
 -              if(!g_ca)
 -                      start_items |= IT_UNLIMITED_AMMO;
 +              start_items |= IT_UNLIMITED_AMMO;
        }
-       else if (g_minstagib)
-       {
-               g_pinata = 0; // incompatible
-               g_weapon_stay = 0; // incompatible
-               g_bloodloss = 0; // incompatible
-               start_health = 100;
-               start_armorvalue = 0;
-               WEPSET_COPY_AW(start_weapons, WEP_MINSTANEX);
-               g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha");
-               start_items |= IT_UNLIMITED_SUPERWEAPONS;
-               if (g_minstagib_invis_alpha <= 0)
-                       g_minstagib_invis_alpha = -1;
-       }
        else
        {
                for (i = WEP_FIRST; i <= WEP_LAST; ++i)