X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=8c898cc54992fe6b9ed674b7768bb563a11838f5;hp=0b851d53b0c5299c7625055d6f470f7925b90564;hb=6b8490ff79ca48220bd0023b5da4019d1bfdcd7d;hpb=2aed36e128f8f00da9c76f9e66baae89d5bb26b2

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 0b851d53b0..8c898cc549 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -2,7 +2,7 @@
 	#include "../dpdefs/csprogsdefs.qh"
     #include "../client/defs.qh"
     #include "util.qh"
-    #include "buffs.qh"
+    #include "buffs/all.qh"
     #include "weapons/all.qh"
     #include "mapinfo.qh"
 #elif defined(MENUQC)
@@ -10,7 +10,7 @@
 	#include "../dpdefs/progsdefs.qh"
     #include "../dpdefs/dpextensions.qh"
     #include "util.qh"
-    #include "buffs.qh"
+    #include "buffs/all.qh"
     #include "monsters/all.qh"
     #include "mapinfo.qh"
 #endif
@@ -169,7 +169,7 @@ float MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, i
 		if(MapInfo_Get_ByName(_MapInfo_GlobItem(i), 1, 0) == 2) // if we generated one... BAIL OUT and let the caller continue in the next frame.
 			if(pAbortOnGenerate)
 			{
-				dprint("Autogenerated a .mapinfo, doing the rest later.\n");
+				LOG_TRACE("Autogenerated a .mapinfo, doing the rest later.\n");
 				MapInfo_progress = i / _MapInfo_globcount;
 				return 0;
 			}
@@ -287,7 +287,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 	}
 	if(fh < 0)
 		return 0;
-	print("Analyzing ", fn, " to generate initial mapinfo\n");
+	LOG_INFO("Analyzing ", fn, " to generate initial mapinfo\n");
 
 	inWorldspawn = 2;
 	MapInfo_Map_flags = 0;
@@ -395,7 +395,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 	}
 	if(inWorldspawn)
 	{
-		print(fn, " ended still in worldspawn, BUG\n");
+		LOG_INFO(fn, " ended still in worldspawn, BUG\n");
 		return 0;
 	}
 	diameter = vlen(mapMaxs - mapMins);
@@ -428,9 +428,9 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 		MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTS;
 	}
 
-	dprint("-> diameter ",    ftos(diameter));
-	dprint(";  spawnpoints ", ftos(spawnpoints));
-	dprint(";  modes ",       ftos(MapInfo_Map_supportedGametypes), "\n");
+	LOG_TRACE("-> diameter ",    ftos(diameter));
+	LOG_TRACE(";  spawnpoints ", ftos(spawnpoints));
+	LOG_TRACE(";  modes ",       ftos(MapInfo_Map_supportedGametypes), "\n");
 
 	fclose(fh);
 
@@ -650,7 +650,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
 		p = strstrofs(sa, "=", 0);
 		if(p < 0)
 		{
-			print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+			LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
 			continue;
 		}
 		k = substring(sa, 0, p);
@@ -691,7 +691,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
 		}
 		else
 		{
-			print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+			LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
 		}
 	}
 
@@ -707,48 +707,25 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
 	}
 }
 
-float MapInfo_Type_FromString(string t)
+int MapInfo_Type_FromString(string t)
 {
-	if(t == "nexball")
-	{
-		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
-		t = "nb";
-		print("'. Should use '", t, "'.\n");
-	}
-	if(t == "freezetag")
-	{
-		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
-		t = "ft";
-		print("'. Should use '", t, "'.\n");
-	}
-	if(t == "keepaway")
-	{
-		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
-		t = "ka";
-		print("'. Should use '", t, "'.\n");
-	}
-	if(t == "invasion")
-	{
-		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
-		t = "inv";
-		print("'. Should use '", t, "'.\n");
-	}
-	if(t == "assault")
-	{
-		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
-		t = "as";
-		print("'. Should use '", t, "'.\n");
-	}
-	if(t == "race")
-	{
-		print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
-		t = "rc";
-		print("'. Should use '", t, "'.\n");
-	}
-	if(t == "all")
-		return MAPINFO_TYPE_ALL;
+#define deprecate(from, to) do { \
+	if (t == #from) { \
+		string replacement = #to; \
+		LOG_WARNINGF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.\n", MapInfo_Map_bspname, t, replacement); \
+		t = replacement; \
+	} \
+} while (0)
+	deprecate(nexball, nb);
+	deprecate(freezetag, ft);
+	deprecate(keepaway, ka);
+	deprecate(invasion, inv);
+	deprecate(assault, as);
+	deprecate(race, rc);
+	if (t == "all") return MAPINFO_TYPE_ALL;
 	FOREACH(MAPINFO_TYPES, it.mdl == t, LAMBDA(return it.items));
 	return 0;
+#undef deprecate
 }
 
 string MapInfo_Type_Description(float t)
@@ -811,7 +788,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 		{
 			fh = fopen(s, FILE_READ);
 			if(fh < 0)
-				print("Map ", pFilename, " references not existing config file ", s, "\n");
+				LOG_INFO("Map ", pFilename, " references not existing config file ", s, "\n");
 			else
 			{
 				for (;;)
@@ -840,23 +817,23 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 			}
 		}
 		else
-			print("Map ", pFilename, " uses too many levels of inclusion\n");
+			LOG_INFO("Map ", pFilename, " uses too many levels of inclusion\n");
 	}
 	else if(t == "")
-		print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_INFO("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
 	else if (!cvar_value_issafe(t))
-		print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_INFO("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
 	else if (!cvar_value_issafe(s))
-		print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_INFO("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
 	else if(matchacl(MAPINFO_SETTEMP_ACL_SYSTEM, t) <= 0)
-		print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
+		LOG_INFO("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
 	else if(matchacl(acl, t) <= 0)
-		print("Map ", pFilename, " contains a denied setting, ignored\n");
+		LOG_INFO("Map ", pFilename, " contains a denied setting, ignored\n");
 	else
 	{
 		if(type == 0) // server set
 		{
-			dprint("Applying temporary setting ", t, " := ", s, "\n");
+			LOG_TRACE("Applying temporary setting ", t, " := ", s, "\n");
 			if(cvar("g_campaign"))
 				cvar_set(t, s); // this is a wrapper and is always temporary anyway; no need to backup old values then
 			else
@@ -864,7 +841,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s,
 		}
 		else
 		{
-			dprint("Applying temporary client setting ", t, " := ", s, "\n");
+			LOG_TRACE("Applying temporary client setting ", t, " := ", s, "\n");
 			MapInfo_Map_clientstuff = strcat(
 					MapInfo_Map_clientstuff, "cl_cmd settemp \"", t, "\" \"", s, "\"\n"
 					);
@@ -911,7 +888,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 
 	if(strstrofs(pFilename, "/", 0) >= 0)
 	{
-		print("Invalid character in map name, ignored\n");
+		LOG_INFO("Invalid character in map name, ignored\n");
 		return 0;
 	}
 
@@ -1001,7 +978,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 				error("... but I just wrote it!");
 		}
 
-		print("WARNING: autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo\n");
+		LOG_INFO("WARNING: autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo\n");
 	}
 
 	_MapInfo_Map_Reset();
@@ -1040,7 +1017,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 			else if(t == "monsters") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS;
 			else if(t == "new_toys") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
 			else
-				dprint("Map ", pFilename, " supports unknown feature ", t, ", ignored\n");
+				LOG_TRACE("Map ", pFilename, " supports unknown feature ", t, ", ignored\n");
 		}
 		else if(t == "hidden")
 		{
@@ -1062,11 +1039,11 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 		{
 			t = car(s); s = cdr(s);
 			f = MapInfo_Type_FromString(t);
-			dprint("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");
+			LOG_WARNING("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(f)
 				_MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true);
 			else
-				dprint("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
+				LOG_TRACE("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
 		}
 		else if(t == "gametype")
 		{
@@ -1075,7 +1052,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 			if(f)
 				_MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f);
 			else
-				dprint("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
+				LOG_TRACE("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
 		}
 		else if(t == "size")
 		{
@@ -1086,16 +1063,16 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 			t = car(s); s = cdr(s); d = stof(t);
 			t = car(s); s = cdr(s); e = stof(t);
 			if(s == "")
-				print("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_INFO("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");
 			else
 			{
 				t = car(s); s = cdr(s); f = stof(t);
 				if(s != "")
-					print("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_INFO("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");
 				else
 				{
 					if(a >= d || b >= e || c >= f)
-						print("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs\n");
+						LOG_INFO("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs\n");
 					else
 					{
 						MapInfo_Map_mins.x = a;
@@ -1120,7 +1097,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 			}
 			else
 			{
-				dprint("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored\n");
+				LOG_TRACE("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored\n");
 			}
 		}
 		else if(t == "clientsettemp_for_type")
@@ -1135,13 +1112,13 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 			}
 			else
 			{
-				dprint("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored\n");
+				LOG_TRACE("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored\n");
 			}
 		}
 		else if(t == "fog")
 		{
 			if (!cvar_value_issafe(s))
-				print("Map ", pFilename, " contains a potentially harmful fog setting, ignored\n");
+				LOG_INFO("Map ", pFilename, " contains a potentially harmful fog setting, ignored\n");
 			else
 				MapInfo_Map_fog = s;
 		}
@@ -1157,7 +1134,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 			if(pGametypeToSet)
 			{
 				if (!cvar_value_issafe(t))
-					print("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");
+					LOG_INFO("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");
 				else
 					MapInfo_Map_clientstuff = strcat(
 						MapInfo_Map_clientstuff, "cd loop \"", t, "\"\n"
@@ -1165,7 +1142,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 			}
 		}
 		else
-			dprint("Map ", pFilename, " provides unknown info item ", t, ", ignored\n");
+			LOG_TRACE("Map ", pFilename, " provides unknown info item ", t, ", ignored\n");
 	}
 	fclose(fh);
 
@@ -1179,7 +1156,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
 	MapInfo_Cache_Store();
 	if(MapInfo_Map_supportedGametypes != 0)
 		return r;
-	dprint("Map ", pFilename, " supports no game types, ignored\n");
+	LOG_TRACE("Map ", pFilename, " supports no game types, ignored\n");
 	return 0;
 }
 float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, int pGametypeToSet)
@@ -1371,14 +1348,14 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
 	{
 		if(cvar("g_mapinfo_allow_unsupported_modes_and_let_stuff_break"))
 		{
-			print("EMERGENCY: can't play the selected map in the given game mode. Working with only the override settings.\n");
+			LOG_INFO("EMERGENCY: can't play the selected map in the given game mode. Working with only the override settings.\n");
 			_MapInfo_Map_ApplyGametypeEx("", t, t);
 			return; // do not call Get_ByName!
 		}
 
 		if(MapInfo_Map_supportedGametypes == 0)
 		{
-			print("Mapinfo system is not functional at all. Assuming deathmatch.\n");
+			LOG_INFO("Mapinfo system is not functional at all. Assuming deathmatch.\n");
 			MapInfo_Map_supportedGametypes = MAPINFO_TYPE_DEATHMATCH;
 			MapInfo_LoadMapSettings_SaveGameType(MAPINFO_TYPE_DEATHMATCH);
 			_MapInfo_Map_ApplyGametypeEx("", MAPINFO_TYPE_DEATHMATCH, MAPINFO_TYPE_DEATHMATCH);
@@ -1393,7 +1370,7 @@ void MapInfo_LoadMapSettings(string s) // to be called from worldspawn
 		}
 
 		// t is now a supported mode!
-		print("EMERGENCY: can't play the selected map in the given game mode. Falling back to a supported mode.\n");
+		LOG_INFO("EMERGENCY: can't play the selected map in the given game mode. Falling back to a supported mode.\n");
 		MapInfo_LoadMapSettings_SaveGameType(t);
 	}
 	MapInfo_Get_ByName(s, 1, t);