bool autocvar_g_mapinfo_ignore_warnings;
#ifdef MENUQC
-#define WARN_COND !autocvar_g_mapinfo_ignore_warnings
+#define WARN_COND (!autocvar_g_mapinfo_ignore_warnings)
#else
#define WARN_COND (!autocvar_g_mapinfo_ignore_warnings && MapInfo_Map_bspname == mi_shortname)
#endif
}
}
-Gametype MapInfo_Type_FromString(string t)
+Gametype MapInfo_Type_FromString(string str)
{
-#define deprecate(from, to) MACRO_BEGIN { \
- if (t == #from) { \
- string replacement = #to; \
- if(WARN_COND) \
- LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, t, replacement); \
- t = replacement; \
- } \
-} MACRO_END
- deprecate(nexball, nb);
- deprecate(freezetag, ft);
- deprecate(keepaway, ka);
- deprecate(invasion, inv);
- deprecate(assault, as);
- deprecate(race, rc);
- FOREACH(Gametypes, it.mdl == t, return it);
+ string replacement = "";
+ switch (str)
+ {
+ case "nexball": replacement = "nb"; break;
+ case "freezetag": replacement = "ft"; break;
+ case "keepaway": replacement = "ka"; break;
+ case "invasion": replacement = "inv"; break;
+ case "assault": replacement = "as"; break;
+ case "race": replacement = "rc"; break;
+ }
+ if (replacement != "" && WARN_COND)
+ {
+ LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, str, replacement);
+ str = replacement;
+ }
+ FOREACH(Gametypes, it.mdl == str, return it);
return NULL;
-#undef deprecate
}
string MapInfo_Type_Description(Gametype t)
{
fh = fopen(s, FILE_READ);
if(fh < 0)
+ {
if(WARN_COND)
LOG_WARN("Map ", pFilename, " references not existing config file ", s);
+ }
else
{
for (;;)
t = car(s); s = cdr(s); d = stof(t);
t = car(s); s = cdr(s); e = stof(t);
if(s == "")
+ {
if(WARN_COND)
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 != "")
+ {
if(WARN_COND)
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)
+ {
if(WARN_COND)
LOG_WARN("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs");
+ }
else
{
MapInfo_Map_mins.x = a;
else if(t == "fog")
{
if (!cvar_value_issafe(s))
+ {
if(WARN_COND)
LOG_WARN("Map ", pFilename, " contains a potentially harmful fog setting, ignored");
+ }
else
MapInfo_Map_fog = s;
}
if(pGametypeToSet)
{
if (!cvar_value_issafe(t))
+ {
if(WARN_COND)
LOG_WARN("Map ", pFilename, " contains a potentially harmful cdtrack, ignored");
+ }
else
MapInfo_Map_clientstuff = strcat(
MapInfo_Map_clientstuff, "cd loop \"", t, "\"\n"