]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix tabs messing up .arena file processing
authorMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 17:38:30 +0000 (03:38 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 17:38:30 +0000 (03:38 +1000)
qcsrc/common/mapinfo.qc

index d3d1f658bcb084550eb7be44132b925482c30321..60f5c40d17feba539f18bec1640670f7c48bb79f 100644 (file)
@@ -604,8 +604,7 @@ Gametype MapInfo_Type_FromString(string gtype)
                // quake 3 compat
                case "ffa":       replacement = "dm"; do_warn = false; break;
                case "cctf":
-               case "oneflag":
-               case "ctf":       replacement = "ctf"; do_warn = false; break;
+               case "oneflag":   replacement = "ctf"; do_warn = false; break;
                case "team":      replacement = "tdm"; do_warn = false; break;
                case "tourney":   replacement = "duel"; do_warn = false; break;
        }
@@ -781,6 +780,7 @@ void _MapInfo_ParseArena(int fh, Gametype pGametypeToSet, bool isdefi)
                        continue;
                if(s == "{" || s == "}")       // opening/closing brackets TODO: make sure we're checking this map's brackets! Q3 can have multiple
                        continue;
+               s = strreplace("\t", " ", s);
 
                float p = strstrofs(s, "//", 0);
                if(p >= 0)