]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/mapinfo.qc
Merge remote branch 'origin/master' into samual/keepaway
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapinfo.qc
index 95301c95c027612dcd92421492a197ade6a4c72b..187bf63be8db373576d92ebc1a320f0527d35dcb 100644 (file)
@@ -469,7 +469,7 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, fl
                sa = car(s);
                if(sa != "")
                        cvar_set("fraglimit", sa);
-               s = cdr(s)
+               s = cdr(s);
        }
 
        // rc = timelimit timelimit_qualification laps laps_teamplay
@@ -661,7 +661,7 @@ float MapInfo_Type_FromString(string t)
        else if(t == "rc")      return MAPINFO_TYPE_RACE;
        else if(t == "nexball") return MAPINFO_TYPE_NEXBALL;
        else if(t == "cts")     return MAPINFO_TYPE_CTS;
-       else if(t == "ka")         return MAPINFO_TYPE_KEEPAWAY;
+       else if(t == "keepaway") return MAPINFO_TYPE_KEEPAWAY;
        else if(t == "all")     return MAPINFO_TYPE_ALL;
        else                    return 0;
 }
@@ -682,7 +682,7 @@ string MapInfo_Type_ToString(float t)
        else if(t == MAPINFO_TYPE_RACE)            return "rc";
        else if(t == MAPINFO_TYPE_NEXBALL)         return "nexball";
        else if(t == MAPINFO_TYPE_CTS)             return "cts";
-       else if(t == MAPINFO_TYPE_KEEPAWAY)             return "ka";
+       else if(t == MAPINFO_TYPE_KEEPAWAY)        return "keepaway";
        else if(t == MAPINFO_TYPE_ALL)             return "all";
        else                                       return "";
 }
@@ -1147,7 +1147,7 @@ float MapInfo_CurrentGametype()
                return MAPINFO_TYPE_NEXBALL;
        else if(cvar("g_cts"))
                return MAPINFO_TYPE_CTS;
-       else if(cvar("g_ka"))
+       else if(cvar("g_keepaway"))
                return MAPINFO_TYPE_KEEPAWAY;
        else
                return MAPINFO_TYPE_DEATHMATCH;
@@ -1190,7 +1190,7 @@ string MapInfo_GetGameTypeCvar(float t)
                case MAPINFO_TYPE_RACE:                         return "g_race";
                case MAPINFO_TYPE_NEXBALL:              return "g_nexball";
                case MAPINFO_TYPE_CTS:                  return "g_cts";
-               case MAPINFO_TYPE_KEEPAWAY:             return "g_ka";
+               case MAPINFO_TYPE_KEEPAWAY:             return "g_keepaway";
                default: return "";
        }
 }
@@ -1212,7 +1212,7 @@ void MapInfo_SwitchGameType(float t)
        cvar_set("g_race",       (t == MAPINFO_TYPE_RACE)            ? "1" : "0");
        cvar_set("g_nexball",    (t == MAPINFO_TYPE_NEXBALL)         ? "1" : "0");
        cvar_set("g_cts",        (t == MAPINFO_TYPE_CTS)             ? "1" : "0");
-       cvar_set("g_ka",            (t == MAPINFO_TYPE_KEEPAWAY)          ? "1" : "0");
+       cvar_set("g_keepaway",   (t == MAPINFO_TYPE_KEEPAWAY)        ? "1" : "0");
 }
 
 void MapInfo_LoadMap(string s)