X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=0884bc8d79054c29d6d88bacb75ad88de011e09b;hb=f41f81f37e3ecf5a2d14f7bc7ffd7bbf09fff32e;hp=92ed2b9f112d9527936c6339cec6c81c9434d675;hpb=46e63c0c71dde9e124236a2994c538ea88ac6e9e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 92ed2b9f1..0884bc8d7 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -231,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 != "\"")
@@ -286,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;
@@ -938,12 +935,12 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 		{
 			t = car(s); s = cdr(s);
 			Gametype f = MapInfo_Type_FromString(t);
-			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(!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 if(!autocvar_g_mapinfo_ignore_warnings)
-				LOG_WARN("Map ", pFilename, " supports unknown game type ", t, ", ignored");
+				LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored");
 		}
 		else if(t == "gametype")
 		{
@@ -952,7 +949,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet
 			if(f)
 				_MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f);
 			else if(!autocvar_g_mapinfo_ignore_warnings)
-				LOG_WARN("Map ", pFilename, " supports unknown game type ", t, ", ignored");
+				LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored");
 		}
 		else if(t == "size")
 		{
@@ -999,7 +996,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")
@@ -1016,7 +1013,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")
@@ -1193,7 +1190,7 @@ void MapInfo_LoadMap(string s, float reinit)
 	//	MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH.m_flags);
 	//}
 
-	LOG_INFO("Switching to map ", s, "\n");
+	LOG_INFO("Switching to map ", s);
 
 	cvar_settemp_restore();
 	if(reinit)
@@ -1205,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);
 }
@@ -1220,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);