From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 24 Feb 2013 18:56:46 +0000 (+0100)
Subject: fix some parts about hidden/forbidden maps
X-Git-Tag: xonotic-v0.7.0~82
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=781274e23da7de4d9b6c94b3c4e8b49f3e205c0e;p=xonotic%2Fxonotic-data.pk3dir.git

fix some parts about hidden/forbidden maps
---

diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c
index c37481b97..b5af66126 100644
--- a/qcsrc/menu/xonotic/maplist.c
+++ b/qcsrc/menu/xonotic/maplist.c
@@ -244,7 +244,7 @@ void MapList_All(entity btn, entity me)
 {
 	float i;
 	string s;
-	MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, MAPINFO_FLAG_FORBIDDEN | MAPINFO_FLAG_HIDDEN, 0); // all
+	MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, MapInfo_ForbiddenFlags(), 0); // all
 	s = "";
 	for(i = 0; i < MapInfo_count; ++i)
 		s = strcat(s, " ", MapInfo_BSPName_ByID(i));
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 5e5fc4c7d..d67ef26eb 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -838,7 +838,7 @@ void spawnfunc_worldspawn (void)
 	for(i = 0, j = 0; i < MapInfo_count; ++i)
 	{
 		if(MapInfo_Get_ByID(i))
-			if not(MapInfo_Map_flags & (MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN))
+			if not(MapInfo_Map_flags & MapInfo_ForbiddenFlags())
 			{
 				if(mod(i, 2))
 					col = "^2";