]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
mapinfo: rename nexball -> nb, keepaway -> ka, freezetag -> ft, to keep all names...
authorRudolf Polzer <divverent@alientrap.org>
Thu, 2 Feb 2012 18:07:41 +0000 (19:07 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 2 Feb 2012 18:12:09 +0000 (19:12 +0100)
Old names are supported for compatibility, but warned about.

qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh

index 1b32c9d1d5a076c3825f5ea9900522282f7abd40..9dd02ca4c2955e25b1c1347343ee0a7e62d9a7b7 100644 (file)
@@ -637,6 +637,24 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
 float MapInfo_Type_FromString(string t)
 {
        entity e;
+       if(t == "nexball")
+       {
+               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               t = "nb";
+               print("'. Should use '", t, "'.\n");
+       }
+       if(t == "freezetag")
+       {
+               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               t = "ft";
+               print("'. Should use '", t, "'.\n");
+       }
+       if(t == "keepaway")
+       {
+               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               t = "ka";
+               print("'. Should use '", t, "'.\n");
+       }
        if(t == "all")
                return MAPINFO_TYPE_ALL;
        for(e = MapInfo_Type_first; e; e = e.enemy)
index 4e73886d3c98cd970066fbe4099790a4566e7114..a3bb4efbfede216fc0a9ad997bda46a6479805c6 100644 (file)
@@ -72,13 +72,13 @@ REGISTER_GAMETYPE(_("Assault"),as,g_assault,ASSAULT,"timelimit=20")
 REGISTER_GAMETYPE(_("Onslaught"),ons,g_onslaught,ONSLAUGHT,"timelimit=20")
 #define g_onslaught IS_GAMETYPE(ONSLAUGHT)
 
-REGISTER_GAMETYPE(_("Nexball"),nexball,g_nexball,NEXBALL,"timelimit=20 pointlimit=5 leadlimit=0")
+REGISTER_GAMETYPE(_("Nexball"),nb,g_nexball,NEXBALL,"timelimit=20 pointlimit=5 leadlimit=0")
 #define g_nexball IS_GAMETYPE(NEXBALL)
 
-REGISTER_GAMETYPE(_("Freeze Tag"),freezetag,g_freezetag,FREEZETAG,"timelimit=20 pointlimit=10 teams=2 leadlimit=0")
+REGISTER_GAMETYPE(_("Freeze Tag"),ft,g_freezetag,FREEZETAG,"timelimit=20 pointlimit=10 teams=2 leadlimit=0")
 #define g_freezetag IS_GAMETYPE(FREEZETAG)
 
-REGISTER_GAMETYPE(_("Keepaway"),keepaway,g_keepaway,KEEPAWAY,"timelimit=20 pointlimit=30")
+REGISTER_GAMETYPE(_("Keepaway"),ka,g_keepaway,KEEPAWAY,"timelimit=20 pointlimit=30")
 #define g_keepaway IS_GAMETYPE(KEEPAWAY)
 
 float MAPINFO_FEATURE_WEAPONS       = 1; // not defined for minstagib-only maps