From: Samual Lenks <samual@xonotic.org>
Date: Fri, 10 May 2013 00:10:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mario/mutator_minstagib'
X-Git-Tag: xonotic-v0.7.0~55^2~3
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=dd26dcda7539f07aae99ec9f6a7c407c7ce43ea6

Merge remote-tracking branch 'origin/Mario/mutator_minstagib'
---

dd26dcda7539f07aae99ec9f6a7c407c7ce43ea6
diff --cc qcsrc/server/miscfunctions.qc
index 191bfaede1,8ad4520494..f1651e23da
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -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)