Merge branch 'master' into mirceakitsune/damage_effects

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

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 366538de71b0346b013d36b32fd7a3315fa0e1ad..469c86a2b68f18822121160a4cea454e0540099e 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -810,6 +810,7 @@ float MapInfo_isRedundant(string fn, string t)
        t = strreplace(":", "-", t);
        t = strreplace(" ", "-", t);
        t = strreplace("_", "-", t);
+       t = strreplace("'", "-", t);
 
        if(!strcasecmp(fn, t))
                return TRUE;
@@ -1083,14 +1084,14 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
                }
        }
 
-       if(MapInfo_Map_titlestring == "<TITLE>")
+       if(MapInfo_Map_title == "<TITLE>")
                MapInfo_Map_titlestring = MapInfo_Map_bspname;
        else if(MapInfo_isRedundant(MapInfo_Map_bspname, MapInfo_Map_title))
                MapInfo_Map_titlestring = MapInfo_Map_title;
        else
                MapInfo_Map_titlestring = sprintf(_("%s: %s"), MapInfo_Map_bspname, MapInfo_Map_title);
 
-       MapInfo_cache_Store();
+       MapInfo_Cache_Store();
        if(MapInfo_Map_supportedGametypes != 0)
                return r;
        dprint("Map ", pFilename, " supports no game types, ignored\n");