X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=62e03d21b6fe8ed4fe375ea60d845636bcc420d7;hp=7120c61eda932fa46b9cc2313dc26c8854549293;hb=b9998b31fc75c66b601e66241350b10ca694809f;hpb=a491650510dce3f774cce457ebf15ddcafcf393f

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 7120c61eda..62e03d21b6 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;
@@ -425,27 +424,7 @@ void _MapInfo_Map_Reset()
 
 string _MapInfo_GetDefault(Gametype t)
 {
-	switch(t)
-	{
-		case MAPINFO_TYPE_DEATHMATCH:      return "30 20 0";
-		case MAPINFO_TYPE_TEAM_DEATHMATCH: return "50 20 2 0";
-		case MAPINFO_TYPE_DOMINATION:      return "200 20 0";
-		case MAPINFO_TYPE_CTF:             return "300 20 10 0";
-		case MAPINFO_TYPE_LMS:             return "9 20 0";
-		case MAPINFO_TYPE_CA:              return "10 20 0";
-		case MAPINFO_TYPE_KEYHUNT:         return "1000 20 3 0";
-		case MAPINFO_TYPE_ASSAULT:         return "20 0";
-		case MAPINFO_TYPE_RACE:            return "20 5 7 15 0";
-		case MAPINFO_TYPE_ONSLAUGHT:       return "20 0";
-		case MAPINFO_TYPE_NEXBALL:         return "5 20 0";
-		case MAPINFO_TYPE_CTS:             return "20 0 0";
-		case MAPINFO_TYPE_FREEZETAG:       return "10 20 0";
-		// NOTE: DO NOT ADD ANY MORE GAME TYPES HERE
-		// THIS IS JUST LEGACY SUPPORT FOR NEXUIZ MAPS
-		// ONLY ADD NEW STUFF TO _MapInfo_GetDefaultEx
-		// THIS FUNCTION WILL EVENTUALLY BE REMOVED
-		default:                           return "";
-	}
+	return t.m_legacydefaults;
 }
 
 void _MapInfo_Map_ApplyGametype(string s, Gametype pWantedType, Gametype pThisType, int load_default)
@@ -458,7 +437,7 @@ void _MapInfo_Map_ApplyGametype(string s, Gametype pWantedType, Gametype pThisTy
 	if(load_default)
 		_MapInfo_Map_ApplyGametype(_MapInfo_GetDefault(pThisType), pWantedType, pThisType, false);
 
-	if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT || pWantedType == MAPINFO_TYPE_RACE || pWantedType == MAPINFO_TYPE_CTS) // these modes don't use fraglimit
+	if(!pWantedType.frags) // these modes don't use fraglimit
 	{
 		cvar_set("fraglimit", "0");
 	}
@@ -486,6 +465,8 @@ void _MapInfo_Map_ApplyGametype(string s, Gametype pWantedType, Gametype pThisTy
 	// rc = timelimit timelimit_qualification laps laps_teamplay
 	if(pWantedType == MAPINFO_TYPE_RACE)
 	{
+		cvar_set("fraglimit", "0"); // special case!
+
 		sa = car(s); if(sa == "") sa = cvar_string("timelimit");
 		cvar_set("g_race_qualifying_timelimit", sa);
 		s = cdr(s);
@@ -503,7 +484,7 @@ void _MapInfo_Map_ApplyGametype(string s, Gametype pWantedType, Gametype pThisTy
 		s = cdr(s);
 	}
 
-	if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT || pWantedType == MAPINFO_TYPE_CTS) // these modes don't use fraglimit
+	if(!pWantedType.frags) // these modes don't use fraglimit
 	{
 		cvar_set("leadlimit", "0");
 	}
@@ -547,7 +528,8 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis
 		if (sa == "") continue;
 		int p = strstrofs(sa, "=", 0);
 		if (p < 0) {
-			LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", 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,7 +568,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis
 			}
 		}
 		FOREACH(Gametypes, true, handled |= it.m_parse_mapinfo(k, v));
-		if (!handled)
+		if (!handled && !autocvar_g_mapinfo_ignore_warnings)
             LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa);
 	}
 
@@ -607,7 +589,8 @@ Gametype MapInfo_Type_FromString(string t)
 #define deprecate(from, to) MACRO_BEGIN { \
 	if (t == #from) { \
 		string replacement = #to; \
-		LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", 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
@@ -756,6 +739,7 @@ float MapInfo_isRedundant(string fn, string t)
 	// we allow the visible title to have punctuation the file name does
 	// not, but not vice versa
 	t = strreplace("-", "", t);
+	fn = strreplace("-", "", fn);
 
 	if(!strcasecmp(fn, t))
 		return true;
@@ -853,6 +837,9 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			if(fexists(strcat("scripts/", pFilename, ".arena")))
 				fputs(fh, "settemp_for_type all sv_q3acompat_machineshotgunswap 1\n");
 
+			if(fexists(strcat("scripts/", pFilename, ".defi")))
+				fputs(fh, "settemp_for_type all sv_vq3compat 1\n");
+
 			fputs(fh, "// optional: fog density red green blue alpha mindist maxdist\n");
 			fputs(fh, "// optional: settemp_for_type (all|gametypename) cvarname value\n");
 			fputs(fh, "// optional: clientsettemp_for_type (all|gametypename) cvarname value\n");
@@ -867,7 +854,8 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 				error("... but I just wrote it!");
 		}
 
-		LOG_WARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo");
+		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();
@@ -933,11 +921,12 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 		{
 			t = car(s); s = cdr(s);
 			Gametype f = MapInfo_Type_FromString(t);
-			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(!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_WARN("Map ", pFilename, " supports unknown game type ", t, ", ignored");
+			else if(!autocvar_g_mapinfo_ignore_warnings)
+				LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored");
 		}
 		else if(t == "gametype")
 		{
@@ -945,8 +934,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_WARN("Map ", pFilename, " supports unknown game type ", t, ", ignored");
+			else if(!autocvar_g_mapinfo_ignore_warnings)
+				LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored");
 		}
 		else if(t == "size")
 		{
@@ -993,7 +982,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			}
 			else
 			{
-				LOG_WARN("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored");
+				LOG_DEBUG("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored");
 			}
 		}
 		else if(t == "clientsettemp_for_type")
@@ -1010,7 +999,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			}
 			else
 			{
-				LOG_WARN("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored");
+				LOG_DEBUG("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored");
 			}
 		}
 		else if(t == "fog")
@@ -1039,7 +1028,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 					);
 			}
 		}
-		else
+		else if(!autocvar_g_mapinfo_ignore_warnings)
 			LOG_WARN("Map ", pFilename, " provides unknown info item ", t, ", ignored");
 	}
 	fclose(fh);
@@ -1061,13 +1050,7 @@ int MapInfo_Get_ByName(string pFilename, float pAllowGenerate, Gametype pGametyp
 {
 	int r = MapInfo_Get_ByName_NoFallbacks(pFilename, pAllowGenerate, pGametypeToSet);
 
-	if(cvar("g_tdm_on_dm_maps"))
-	{
-		// if this is set, all DM maps support TDM too
-		if (!(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH.m_flags))
-			if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH.m_flags)
-				_MapInfo_Map_ApplyGametypeEx ("", pGametypeToSet, MAPINFO_TYPE_TEAM_DEATHMATCH);
-	}
+	FOREACH(Gametypes, it.m_isForcedSupported(it), _MapInfo_Map_ApplyGametypeEx("", pGametypeToSet, it));
 
 	if(pGametypeToSet)
 	{
@@ -1151,12 +1134,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;
@@ -1165,7 +1150,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;
 }
@@ -1185,6 +1170,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"));
@@ -1195,14 +1182,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);
 }
@@ -1210,14 +1196,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);
@@ -1237,7 +1222,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"))
 		{
@@ -1268,6 +1253,9 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
 		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);
 }