X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=849dcdab45197e62877c96d5bf124b1bd4443589;hb=7e831a7d912845a7139ee8deda891378bb4c2197;hp=113e9f427df5b8105d918b7483e482142b3d4deb;hpb=5ccb0ec591b75a8af431dcc5c9d590d1a98054a6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 113e9f427..849dcdab4 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -915,8 +915,15 @@ void readplayerstartcvars()
 
 	g_weaponarena = 0;
 	s = cvar_string("g_weaponarena");
-	if (s == "0")
+	if (s == "0" || s == "")
 	{
+		if(g_lms || g_ca)
+			s = "most";
+	}
+
+	if (s == "off")
+	{
+		// forcibly turn off weaponarena
 	}
 	else if (s == "all")
 	{
@@ -981,6 +988,40 @@ void readplayerstartcvars()
 	if (g_weaponarena)
 	{
 		start_weapons = g_weaponarena;
+		if(!(g_lms || g_ca))
+			start_items |= IT_UNLIMITED_AMMO;
+	}
+	else if (g_minstagib)
+	{
+		start_health = 100;
+		start_armorvalue = 0;
+		start_weapons = WEPBIT_MINSTANEX;
+		weapon_action(WEP_MINSTANEX, WR_PRECACHE);
+		g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha");
+
+		if (g_minstagib_invis_alpha <= 0)
+			g_minstagib_invis_alpha = -1;
+	}
+	else
+	{
+		for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+		{
+			e = get_weaponinfo(i);
+			if(want_weapon("g_start_weapon_", e, FALSE))
+				start_weapons |= e.weapons;
+		}
+	}
+
+	if(!cvar("g_use_ammunition"))
+		start_items |= IT_UNLIMITED_AMMO;
+
+	if(g_minstagib)
+	{
+		start_ammo_cells = cvar("g_minstagib_ammo_start");
+		start_ammo_fuel = cvar("g_start_ammo_fuel");
+	}
+	else if(start_items & IT_UNLIMITED_WEAPON_AMMO)
+	{
 		for (j = WEP_FIRST; j <= WEP_LAST; ++j)
 		{
 			e = get_weaponinfo(j);
@@ -998,32 +1039,16 @@ void readplayerstartcvars()
 					start_ammo_fuel = 999;
 			}
 		}
-		start_items |= IT_UNLIMITED_AMMO;
-	}
-	else if (g_minstagib)
-	{
-		start_health = 100;
-		start_armorvalue = 0;
-		start_weapons = WEPBIT_MINSTANEX;
-		weapon_action(WEP_MINSTANEX, WR_PRECACHE);
-		start_ammo_cells = cvar("g_minstagib_ammo_start");
-		g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha");
-		start_ammo_fuel = cvar("g_start_ammo_fuel");
-
-		if (g_minstagib_invis_alpha <= 0)
-			g_minstagib_invis_alpha = -1;
 	}
 	else
 	{
-		if (g_lms || g_ca)
+		if(g_lms || g_ca)
 		{
 			start_ammo_shells = cvar("g_lms_start_ammo_shells");
 			start_ammo_nails = cvar("g_lms_start_ammo_nails");
 			start_ammo_rockets = cvar("g_lms_start_ammo_rockets");
 			start_ammo_cells = cvar("g_lms_start_ammo_cells");
 			start_ammo_fuel = cvar("g_lms_start_ammo_fuel");
-			start_health = cvar("g_lms_start_health");
-			start_armorvalue = cvar("g_lms_start_armor");
 		}
 		else
 		{
@@ -1033,13 +1058,12 @@ void readplayerstartcvars()
 			start_ammo_cells = cvar("g_start_ammo_cells");
 			start_ammo_fuel = cvar("g_start_ammo_fuel");
 		}
+	}
 
-		for (i = WEP_FIRST; i <= WEP_LAST; ++i)
-		{
-			e = get_weaponinfo(i);
-			if(want_weapon("g_start_weapon_", e, FALSE))
-				start_weapons |= e.weapons;
-		}
+	if (g_lms || g_ca)
+	{
+		start_health = cvar("g_lms_start_health");
+		start_armorvalue = cvar("g_lms_start_armor");
 	}
 
 	if (inWarmupStage)
@@ -1080,22 +1104,6 @@ void readplayerstartcvars()
 		warmup_start_ammo_fuel = max(warmup_start_ammo_fuel, cvar("g_balance_fuel_rotstable"));
 	}
 
-	if(!cvar("g_use_ammunition"))
-	{
-		start_ammo_shells = cvar("g_pickup_shells_max");
-		start_ammo_nails = cvar("g_pickup_nails_max");
-		start_ammo_rockets = cvar("g_pickup_rockets_max");
-		start_ammo_cells = cvar("g_pickup_cells_max");
-		start_ammo_fuel = cvar("g_pickup_fuel_max");
-		start_items |= IT_UNLIMITED_AMMO;
-		warmup_start_ammo_shells = cvar("g_pickup_shells_max");
-		warmup_start_ammo_nails = cvar("g_pickup_nails_max");
-		warmup_start_ammo_rockets = cvar("g_pickup_rockets_max");
-		warmup_start_ammo_cells = cvar("g_pickup_cells_max");
-		warmup_start_ammo_fuel = cvar("g_pickup_fuel_max");
-		//warmup_start_items |= IT_UNLIMITED_AMMO;
-	}
-
 	if (g_jetpack)
 		start_items |= IT_JETPACK;
 
@@ -2545,10 +2553,7 @@ float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, f
 
         // rule 6: we must not end up in trigger_hurt
         if (tracebox_hits_trigger_hurt(start, e.mins, e.maxs, enddown))
-        {
-            dprint("trigger_hurt! ouch! and nothing else could find it!\n");
             continue;
-        }
 
         break;
     }