From: Mario <mario@smbclan.net>
Date: Mon, 2 Sep 2019 06:46:24 +0000 (+1000)
Subject: Fix map sizes not actually listening to the count bots setting
X-Git-Tag: xonotic-v0.8.5~1329
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b4fe1ad3fefeacb942754decab190f39e0233207;p=xonotic%2Fxonotic-data.pk3dir.git

Fix map sizes not actually listening to the count bots setting
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index de94702f6..36ca8b267 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -293,8 +293,6 @@ void cvar_changes_init()
 		BADCVAR("teamplay");
 		BADCVAR("timelimit");
 		BADCVAR("g_mapinfo_ignore_warnings");
-		BADCVAR("g_maplist_ignore_sizes");
-		BADCVAR("g_maplist_sizes_count_bots");
 
 		// long
 		BADCVAR("hostname");
@@ -1060,12 +1058,12 @@ bool MapHasRightSize(string map)
 		int mapmin = stoi(fgets(fh));
 		int mapmax = stoi(fgets(fh));
 		fclose(fh);
-		if(player_count < mapmin)
+		if(pcount < mapmin)
 		{
 			LOG_TRACE(opensize_msg, "not enough");
 			return false;
 		}
-		if(mapmax && player_count > mapmax)
+		if(mapmax && pcount > mapmax)
 		{
 			LOG_TRACE(opensize_msg, "too many");
 			return false;