]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add a rough stub to replace the "team" gametype with "tdm ft" when parsing .arena...
authorMario <mario.mario@y7mail.com>
Wed, 5 Aug 2020 02:08:58 +0000 (12:08 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 5 Aug 2020 02:08:58 +0000 (12:08 +1000)
qcsrc/common/mapinfo.qc

index 08db62281e958b6b4f4f2447e19440110857a330..f8c960a4a9474b012fd7a4092263094935dbbfc2 100644 (file)
@@ -626,7 +626,6 @@ Gametype MapInfo_Type_FromString(string gtype, bool dowarn, bool is_q3compat)
                case "ffa":       replacement = "dm"; do_warn = false; break;
                case "cctf":
                case "oneflag":   replacement = "ctf"; do_warn = false; break;
-               case "team":      replacement = "tdm"; do_warn = false; break;
                case "tourney":   replacement = "duel"; do_warn = false; break;
                case "arena":     if(is_q3compat) { replacement = "ca"; do_warn = false; } break;
        }
@@ -899,7 +898,8 @@ bool _MapInfo_ParseArena(string arena_filename, int fh, string pFilename, Gamety
                        // if there is a valid gametype in this .arena file, include it in the menu
                        stored_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
                        // type in quake 3 holds all the supported gametypes, so we must loop through all of them
-                       FOREACH_WORD(s, true,
+                       string types = strreplace("team", "tdm ft", s); // TODO: handle support here better to include more Xonotic teamplay modes
+                       FOREACH_WORD(types, true,
                        {
                                Gametype f = MapInfo_Type_FromString(it, false, true);
                                if(f)