Merge branches 'TimePath/oo', 'TimePath/buffsys', 'TimePath/gametypesys'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapinfo.qc

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index b8622fd321b5f868617220d431ace32b44dd7daa..33af1b3900ddf163bc14dd0844e6f03bcb9aec4b 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1166,7 +1166,13 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
                else if(t == "cdtrack")
                {
                        t = car(s); s = cdr(s);
-                       if(pGametypeToSet) // FIXME is this check right here?
+                       // We do this only if pGametypeToSet even though this
+                       // content is theoretically game type independent,
+                       // because MapInfo_Map_clientstuff contains otherwise
+                       // game type dependent stuff. That way this value stays
+                       // empty when not setting a game type to not set any
+                       // false expectations.
+                       if(pGametypeToSet)
                        {
                                if (!cvar_value_issafe(t))
                                        print("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");