git wants me to commit, so I will: begin using the improved kill delay code

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

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 95301c95c027612dcd92421492a197ade6a4c72b..35a827f90035438c33b7a6ce60b25d19e5629008 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -351,6 +351,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 
                if(spawnpoints >= 8  && diameter > 4096) {
                        MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_TEAM_DEATHMATCH;
+                       MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_FREEZETAG;
                        MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CA;
                }
                if(                     diameter < 4096)
@@ -407,6 +408,7 @@ string _MapInfo_GetDefault(float t)
                case MAPINFO_TYPE_ONSLAUGHT:       return "20 0";
                case MAPINFO_TYPE_NEXBALL:         return "5 20 0";
                case MAPINFO_TYPE_CTS:             return "20 0 0";
+               case MAPINFO_TYPE_FREEZETAG:       return "10 20 0";
                case MAPINFO_TYPE_KEEPAWAY:        return "30 20 0";
                default:                           return "";
        }
@@ -469,7 +471,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
@@ -536,6 +538,7 @@ string _MapInfo_GetDefaultEx(float t)
                case MAPINFO_TYPE_ONSLAUGHT:       return "timelimit=20";
                case MAPINFO_TYPE_NEXBALL:         return "timelimit=20 pointlimit=5 leadlimit=0";
                case MAPINFO_TYPE_CTS:             return "timelimit=20 skill=-1";
+               case MAPINFO_TYPE_FREEZETAG:       return "timelimit=20 pointlimit=10 teams=2 leadlimit=0";
                case MAPINFO_TYPE_KEEPAWAY:        return "timelimit=20 pointlimit=30";
                default:                           return "";
        }
@@ -661,7 +664,8 @@ 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 == "freezetag")       return MAPINFO_TYPE_FREEZETAG;
+       else if(t == "keepaway") return MAPINFO_TYPE_KEEPAWAY;
        else if(t == "all")     return MAPINFO_TYPE_ALL;
        else                    return 0;
 }
@@ -682,7 +686,8 @@ 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_FREEZETAG)       return "freezetag";
+       else if(t == MAPINFO_TYPE_KEEPAWAY)        return "keepaway";
        else if(t == MAPINFO_TYPE_ALL)             return "all";
        else                                       return "";
 }
@@ -1147,7 +1152,9 @@ 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_freezetag"))
+               return MAPINFO_TYPE_FREEZETAG;
+       else if(cvar("g_keepaway"))
                return MAPINFO_TYPE_KEEPAWAY;
        else
                return MAPINFO_TYPE_DEATHMATCH;
@@ -1176,21 +1183,22 @@ string MapInfo_GetGameTypeCvar(float t)
 {
        switch(t)
        {
-               case MAPINFO_TYPE_DEATHMATCH:           return "g_dm";
-               case MAPINFO_TYPE_TEAM_DEATHMATCH:      return "g_tdm";
-               case MAPINFO_TYPE_DOMINATION:           return "g_domination";
-               case MAPINFO_TYPE_CTF:                  return "g_ctf";
-               case MAPINFO_TYPE_RUNEMATCH:            return "g_runematch";
-               case MAPINFO_TYPE_LMS:                  return "g_lms";
-               case MAPINFO_TYPE_ARENA:                        return "g_arena";
-               case MAPINFO_TYPE_CA:                   return "g_ca";
-               case MAPINFO_TYPE_KEYHUNT:              return "g_kh";
-               case MAPINFO_TYPE_ASSAULT:              return "g_assault";
-               case MAPINFO_TYPE_ONSLAUGHT:            return "g_onslaught";
-               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_DEATHMATCH: return "g_dm";
+               case MAPINFO_TYPE_TEAM_DEATHMATCH: return "g_tdm";
+               case MAPINFO_TYPE_DOMINATION: return "g_domination";
+               case MAPINFO_TYPE_CTF: return "g_ctf";
+               case MAPINFO_TYPE_RUNEMATCH: return "g_runematch";
+               case MAPINFO_TYPE_LMS: return "g_lms";
+               case MAPINFO_TYPE_ARENA: return "g_arena";
+               case MAPINFO_TYPE_CA: return "g_ca";
+               case MAPINFO_TYPE_KEYHUNT: return "g_kh";
+               case MAPINFO_TYPE_ASSAULT: return "g_assault";
+               case MAPINFO_TYPE_ONSLAUGHT: return "g_onslaught";
+               case MAPINFO_TYPE_RACE: return "g_race";
+               case MAPINFO_TYPE_NEXBALL: return "g_nexball";
+               case MAPINFO_TYPE_FREEZETAG: return "g_freezetag";
+               case MAPINFO_TYPE_CTS: return "g_cts";
+               case MAPINFO_TYPE_KEEPAWAY:             return "g_keepaway";
                default: return "";
        }
 }
@@ -1212,7 +1220,8 @@ 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_freezetag",  (t == MAPINFO_TYPE_FREEZETAG)       ? "1" : "0");
+       cvar_set("g_keepaway",   (t == MAPINFO_TYPE_KEEPAWAY)        ? "1" : "0");
 }
 
 void MapInfo_LoadMap(string s)