X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=0884bc8d79054c29d6d88bacb75ad88de011e09b;hp=47104bb2dc42f1c7765282806859324e4c3ef2cb;hb=95a5a2479a35e264473e8ba3fc4e584553da42b3;hpb=7659c838b7bae69973b91f527c7ca67911f0d858

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 47104bb2d..0884bc8d7 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -9,6 +9,8 @@
     #include <common/monsters/_mod.qh>
 #endif
 
+bool autocvar_g_mapinfo_ignore_warnings;
+
 // generic string stuff
 
 int _MapInfo_Cache_Active;
@@ -229,16 +231,13 @@ string MapInfo_BSPName_ByID(float i)
 
 string unquote(string s)
 {
-	float i, j, l;
-	l = strlen(s);
-	j = -1;
-	for(i = 0; i < l; ++i)
+	float l = strlen(s);
+	for(float i = 0; i < l; ++i)
 	{
-		string ch;
-		ch = substring(s, i, 1);
-		if(ch != " ") if(ch != "\"")
+		string ch = substring(s, i, 1);
+		if((ch != " ") && (ch != "\""))
 		{
-			for(j = strlen(s) - i - 1; j > 0; --j)
+			for(float j = l - i - 1; j > 0; --j)
 			{
 				ch = substring(s, i+j, 1);
 				if(ch != " ") if(ch != "\"")
@@ -284,7 +283,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 	}
 	if(fh < 0)
 		return 0;
-	LOG_INFO("Analyzing ", fn, " to generate initial mapinfo\n");
+	LOG_INFO("Analyzing ", fn, " to generate initial mapinfo");
 
 	inWorldspawn = 2;
 	MapInfo_Map_flags = 0;
@@ -376,7 +375,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 	}
 	if(inWorldspawn)
 	{
-		LOG_MAPWARN(fn, " ended still in worldspawn, BUG\n");
+		LOG_WARN(fn, " ended still in worldspawn, BUG");
 		return 0;
 	}
 	diameter = vlen(mapMaxs - mapMins);
@@ -547,7 +546,8 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis
 		if (sa == "") continue;
 		int p = strstrofs(sa, "=", 0);
 		if (p < 0) {
-			LOG_MAPWARNF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa);
+			if(!autocvar_g_mapinfo_ignore_warnings)
+				LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa);
 			continue;
 		}
 		string k = substring(sa, 0, p);
@@ -586,8 +586,8 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis
 			}
 		}
 		FOREACH(Gametypes, true, handled |= it.m_parse_mapinfo(k, v));
-		if (!handled)
-            LOG_MAPWARNF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa);
+		if (!handled && !autocvar_g_mapinfo_ignore_warnings)
+            LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa);
 	}
 
 	if (pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2)
@@ -607,7 +607,8 @@ Gametype MapInfo_Type_FromString(string t)
 #define deprecate(from, to) MACRO_BEGIN { \
 	if (t == #from) { \
 		string replacement = #to; \
-		LOG_MAPWARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.\n", MapInfo_Map_bspname, t, replacement); \
+		if(!autocvar_g_mapinfo_ignore_warnings) \
+			LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, t, replacement); \
 		t = replacement; \
 	} \
 } MACRO_END
@@ -677,7 +678,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 		{
 			fh = fopen(s, FILE_READ);
 			if(fh < 0)
-				LOG_MAPWARN("Map ", pFilename, " references not existing config file ", s, "\n");
+				LOG_WARN("Map ", pFilename, " references not existing config file ", s);
 			else
 			{
 				for (;;)
@@ -706,18 +707,18 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 			}
 		}
 		else
-			LOG_MAPWARN("Map ", pFilename, " uses too many levels of inclusion\n");
+			LOG_WARN("Map ", pFilename, " uses too many levels of inclusion");
 	}
 	else if(t == "")
-		LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored");
 	else if (!cvar_value_issafe(t))
-		LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored");
 	else if (!cvar_value_issafe(s))
-		LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored");
 	else if(matchacl(MAPINFO_SETTEMP_ACL_SYSTEM, t) <= 0)
-		LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored");
 	else if(matchacl(acl, t) <= 0)
-		LOG_MAPWARN("Map ", pFilename, " contains a denied setting, ignored\n");
+		LOG_WARN("Map ", pFilename, " contains a denied setting, ignored");
 	else
 	{
 		if(type == 0) // server set
@@ -777,7 +778,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 
 	if(strstrofs(pFilename, "/", 0) >= 0)
 	{
-		LOG_MAPWARN("Invalid character in map name, ignored\n");
+		LOG_WARN("Invalid character in map name, ignored");
 		return 0;
 	}
 
@@ -867,7 +868,8 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 				error("... but I just wrote it!");
 		}
 
-		LOG_MAPWARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo\n");
+		if(!autocvar_g_mapinfo_ignore_warnings)
+			LOG_WARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo");
 	}
 
 	_MapInfo_Map_Reset();
@@ -906,7 +908,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			else if(t == "monsters") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS;
 			else if(t == "new_toys") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
 			else
-				LOG_MAPWARN("Map ", pFilename, " supports unknown feature ", t, ", ignored\n");
+				LOG_WARN("Map ", pFilename, " supports unknown feature ", t, ", ignored");
 		}
 		else if(t == "hidden")
 		{
@@ -933,11 +935,12 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 		{
 			t = car(s); s = cdr(s);
 			Gametype f = MapInfo_Type_FromString(t);
-			LOG_MAPWARN("Map ", pFilename, " contains the legacy 'type' keyword which is deprecated and will be removed in the future. Please migrate the mapinfo file to 'gametype'.\n");
+			//if(!autocvar_g_mapinfo_ignore_warnings)
+				//LOG_WARN("Map ", pFilename, " contains the legacy 'type' keyword which is deprecated and will be removed in the future. Please migrate the mapinfo file to 'gametype'.");
 			if(f)
 				_MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true);
-			else
-				LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
+			else if(!autocvar_g_mapinfo_ignore_warnings)
+				LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored");
 		}
 		else if(t == "gametype")
 		{
@@ -945,8 +948,8 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			Gametype f = MapInfo_Type_FromString(t);
 			if(f)
 				_MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f);
-			else
-				LOG_MAPWARN("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
+			else if(!autocvar_g_mapinfo_ignore_warnings)
+				LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored");
 		}
 		else if(t == "size")
 		{
@@ -957,16 +960,16 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			t = car(s); s = cdr(s); d = stof(t);
 			t = car(s); s = cdr(s); e = stof(t);
 			if(s == "")
-				LOG_MAPWARN("Map ", pFilename, " contains an incorrect size line (not enough params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z\n");
+				LOG_WARN("Map ", pFilename, " contains an incorrect size line (not enough params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z");
 			else
 			{
 				t = car(s); s = cdr(s); f = stof(t);
 				if(s != "")
-					LOG_MAPWARN("Map ", pFilename, " contains an incorrect size line (too many params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z\n");
+					LOG_WARN("Map ", pFilename, " contains an incorrect size line (too many params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z");
 				else
 				{
 					if(a >= d || b >= e || c >= f)
-						LOG_MAPWARN("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs\n");
+						LOG_WARN("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs");
 					else
 					{
 						MapInfo_Map_mins.x = a;
@@ -982,39 +985,41 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 		else if(t == "settemp_for_type")
 		{
 			t = car(s); s = cdr(s);
-			Gametype f;
-			if((f = MapInfo_Type_FromString(t)))
+			bool all = t == "all";
+			Gametype f = NULL;
+			if(all || (f = MapInfo_Type_FromString(t)))
 			{
-				if(f.m_flags & pGametypeToSet.m_flags)
+				if((all ? MAPINFO_TYPE_ALL : f.m_flags) & pGametypeToSet.m_flags)
 				{
 					_MapInfo_Parse_Settemp(pFilename, acl, 0, s, 1);
 				}
 			}
 			else
 			{
-				LOG_MAPWARN("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored\n");
+				LOG_DEBUG("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored");
 			}
 		}
 		else if(t == "clientsettemp_for_type")
 		{
 			t = car(s); s = cdr(s);
-			Gametype f;
-			if((f = MapInfo_Type_FromString(t)))
+			bool all = t == "all";
+			Gametype f = NULL;
+			if(all || (f = MapInfo_Type_FromString(t)))
 			{
-				if(f.m_flags & pGametypeToSet.m_flags)
+				if((all ? MAPINFO_TYPE_ALL : f.m_flags) & pGametypeToSet.m_flags)
 				{
 					_MapInfo_Parse_Settemp(pFilename, acl, 1, s, 1);
 				}
 			}
 			else
 			{
-				LOG_MAPWARN("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored\n");
+				LOG_DEBUG("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored");
 			}
 		}
 		else if(t == "fog")
 		{
 			if (!cvar_value_issafe(s))
-				LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful fog setting, ignored\n");
+				LOG_WARN("Map ", pFilename, " contains a potentially harmful fog setting, ignored");
 			else
 				MapInfo_Map_fog = s;
 		}
@@ -1030,15 +1035,15 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			if(pGametypeToSet)
 			{
 				if (!cvar_value_issafe(t))
-					LOG_MAPWARN("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");
+					LOG_WARN("Map ", pFilename, " contains a potentially harmful cdtrack, ignored");
 				else
 					MapInfo_Map_clientstuff = strcat(
 						MapInfo_Map_clientstuff, "cd loop \"", t, "\"\n"
 					);
 			}
 		}
-		else
-			LOG_MAPWARN("Map ", pFilename, " provides unknown info item ", t, ", ignored\n");
+		else if(!autocvar_g_mapinfo_ignore_warnings)
+			LOG_WARN("Map ", pFilename, " provides unknown info item ", t, ", ignored");
 	}
 	fclose(fh);
 
@@ -1052,7 +1057,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 	MapInfo_Cache_Store();
 	if(MapInfo_Map_supportedGametypes != 0)
 		return r;
-	LOG_MAPWARN("Map ", pFilename, " supports no game types, ignored\n");
+	LOG_WARN("Map ", pFilename, " supports no game types, ignored");
 	return 0;
 }
 int MapInfo_Get_ByName(string pFilename, float pAllowGenerate, Gametype pGametypeToSet)
@@ -1149,12 +1154,14 @@ Gametype MapInfo_CurrentGametype()
 	return prev ? prev : MAPINFO_TYPE_DEATHMATCH;
 }
 
-float _MapInfo_CheckMap(string s) // returns 0 if the map can't be played with the current settings, 1 otherwise
+float _MapInfo_CheckMap(string s, bool gametype_only) // returns 0 if the map can't be played with the current settings, 1 otherwise
 {
 	if(!MapInfo_Get_ByName(s, 1, NULL))
 		return 0;
 	if((MapInfo_Map_supportedGametypes & MapInfo_CurrentGametype().m_flags) == 0)
 		return 0;
+	if (gametype_only)
+		return 1;
 	if((MapInfo_Map_supportedFeatures & MapInfo_CurrentFeatures()) != MapInfo_CurrentFeatures())
 		return 0;
 	return 1;
@@ -1163,7 +1170,7 @@ float _MapInfo_CheckMap(string s) // returns 0 if the map can't be played with t
 float MapInfo_CheckMap(string s) // returns 0 if the map can't be played with the current settings, 1 otherwise
 {
 	float r;
-	r = _MapInfo_CheckMap(s);
+	r = _MapInfo_CheckMap(s, false);
 	MapInfo_ClearTemps();
 	return r;
 }
@@ -1183,6 +1190,8 @@ void MapInfo_LoadMap(string s, float reinit)
 	//	MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH.m_flags);
 	//}
 
+	LOG_INFO("Switching to map ", s);
+
 	cvar_settemp_restore();
 	if(reinit)
 		localcmd(strcat("\nmap ", s, "\n"));
@@ -1193,14 +1202,13 @@ void MapInfo_LoadMap(string s, float reinit)
 string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbiddenFlags)
 {
 	string out;
-	float i;
 
 	// to make absolutely sure:
 	MapInfo_Enumerate();
 	MapInfo_FilterGametype(type, MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0);
 
 	out = "";
-	for(i = 0; i < MapInfo_count; ++i)
+	for(float i = 0; i < MapInfo_count; ++i)
 		out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i)));
 	return substring(out, 1, strlen(out) - 1);
 }
@@ -1208,14 +1216,13 @@ string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbi
 string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags)
 {
 	string out;
-	float i;
 
 	// to make absolutely sure:
 	MapInfo_Enumerate();
 	_MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, pRequiredFlags, pForbiddenFlags, 0);
 
 	out = "";
-	for(i = 0; i < MapInfo_count; ++i)
+	for(float i = 0; i < MapInfo_count; ++i)
 		out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i)));
 
 	MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0);
@@ -1235,7 +1242,7 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
 	Gametype t = MapInfo_CurrentGametype();
 	MapInfo_LoadMapSettings_SaveGameType(t);
 
-	if(!_MapInfo_CheckMap(s)) // with underscore, it keeps temps
+	if(!_MapInfo_CheckMap(s, true)) // with underscore, it keeps temps
 	{
 		if(cvar("g_mapinfo_allow_unsupported_modes_and_let_stuff_break"))
 		{
@@ -1259,12 +1266,16 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
 			_t <<= 1;
 			MapInfo_Map_supportedGametypes = floor(MapInfo_Map_supportedGametypes >> 1);
 		}
+		Gametype t_prev = t;
 		FOREACH(Gametypes, it.m_flags == _t, { t = it; break; });
 
 		// t is now a supported mode!
-		LOG_WARN("can't play the selected map in the given game mode. Falling back to a supported mode.");
+		LOG_WARNF("can't play the selected map in the given game mode (%s). Falling back to a supported mode (%s).", t_prev.mdl, t.mdl);
 		MapInfo_LoadMapSettings_SaveGameType(t);
 	}
+	if(!_MapInfo_CheckMap(s, false)) { // with underscore, it keeps temps
+		LOG_WARNF("the selected map lacks features required by current settings; playing anyway.");
+	}
 	MapInfo_Get_ByName(s, 1, t);
 }