X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=13eb647dbdeb36d83aeebb371d88a44e4bcef1f4;hp=fa8be67fe04bdcae11117eec41683166b2a74ae0;hb=94a967120c8bfe0d4ffd95690b97e5af297dfc05;hpb=58b8eafbf5e2ff9147477e115292246458c4c5eb

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index fa8be67fe0..13eb647dbd 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -750,7 +750,7 @@ void readplayerstartcvars()
 	s = cvar_string("g_weaponarena");
 	if (s == "0" || s == "")
 	{
-		if(g_lms || g_ca)
+		if(g_ca)
 			s = "most";
 	}
 
@@ -828,7 +828,7 @@ void readplayerstartcvars()
 		g_pinata = 0; // incompatible
 		g_weapon_stay = 0; // incompatible
 		WEPSET_COPY_AA(start_weapons, g_weaponarena_weapons);
-		if(!(g_lms || g_ca))
+		if(!g_ca)
 			start_items |= IT_UNLIMITED_AMMO;
 	}
 	else if (g_minstagib)
@@ -881,7 +881,7 @@ void readplayerstartcvars()
 	}
 	else
 	{
-		if(g_lms || g_ca)
+		if(g_ca)
 		{
 			start_ammo_shells = cvar("g_lms_start_ammo_shells");
 			start_ammo_nails = cvar("g_lms_start_ammo_nails");
@@ -899,7 +899,7 @@ void readplayerstartcvars()
 		}
 	}
 
-	if (g_lms || g_ca)
+	if (g_ca)
 	{
 		start_health = cvar("g_lms_start_health");
 		start_armorvalue = cvar("g_lms_start_armor");