Hide the MOTD when going spec

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

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index ba21ff43d9cac6da7b25050680d06f4baf5fe3df..4f856670b8110ee26731dffc67b5305159439e6d 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1,5 +1,4 @@
 #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
     #include "../client/defs.qh"
     #include "util.qh"
     #include "buffs/all.qh"
@@ -7,8 +6,6 @@
     #include "mapinfo.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
     #include "util.qh"
     #include "buffs/all.qh"
     #include "monsters/all.qh"
@@ -614,13 +611,8 @@ float _MapInfo_GetTeamPlayBool(float t)
 
 void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
 {
-       string sa, k, v;
-       float p;
-       string fraglimit_normal;
-       string fraglimit_teams;
-
        MapInfo_Map_supportedGametypes |= pThisType;
-       if(!(pThisType & pWantedType))
+       if (!(pThisType & pWantedType))
                return;
 
        // reset all the cvars to their defaults
@@ -628,74 +620,60 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
        cvar_set("timelimit", cvar_defstring("timelimit"));
        cvar_set("leadlimit", cvar_defstring("leadlimit"));
        cvar_set("fraglimit", cvar_defstring("fraglimit"));
-       cvar_set("g_tdm_teams", cvar_defstring("g_tdm_teams"));
-       cvar_set("g_ca_teams", cvar_defstring("g_ca_teams"));
-       cvar_set("g_freezetag_teams", cvar_defstring("g_freezetag_teams"));
-       cvar_set("g_keyhunt_teams", cvar_defstring("g_keyhunt_teams"));
-       cvar_set("g_domination_default_teams", cvar_defstring("g_domination_default_teams"));
-       cvar_set("g_race_qualifying_timelimit", cvar_defstring("g_race_qualifying_timelimit"));
-
-       fraglimit_normal = string_null;
-       fraglimit_teams = string_null;
-
-       s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s);
-       while(s != "")
-       {
-               sa = car(s);
-               s = cdr(s);
+       FOREACH(Gametypes, true, LAMBDA(it.m_parse_mapinfo(string_null, string_null)));
 
-               if(sa == "")
-                       continue;
+       string fraglimit_normal = string_null;
+       string fraglimit_teams = string_null;
 
-               p = strstrofs(sa, "=", 0);
-               if(p < 0)
-               {
-                       LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+       for (s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s); s != ""; s = cdr(s)) {
+               string sa = car(s);
+               if (sa == "") continue;
+               int p = strstrofs(sa, "=", 0);
+               if (p < 0) {
+                       LOG_WARNINGF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa);
                        continue;
                }
-               k = substring(sa, 0, p);
-               v = substring(sa, p+1, -1);
-
-               if(k == "timelimit")
-               {
-                       cvar_set("timelimit", v);
-               }
-               else if(k == "leadlimit")
-               {
-                       cvar_set("leadlimit", v);
-               }
-               else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit" || k == "caplimit")
-               {
-                       fraglimit_normal = v;
-               }
-               else if(k == "teampointlimit" || k == "teamlaplimit")
-               {
-                       fraglimit_teams = v;
-               }
-               else if(k == "teams")
-               {
-                       cvar_set("g_tdm_teams", v);
-                       cvar_set("g_ca_teams", v);
-                       cvar_set("g_freezetag_teams", v);
-                       cvar_set("g_keyhunt_teams", v);
-                       cvar_set("g_domination_default_teams", v);
-                       cvar_set("g_invasion_teams", v);
-               }
-               else if(k == "qualifying_timelimit")
-               {
-                       cvar_set("g_race_qualifying_timelimit", v);
-               }
-               else if(k == "skill")
-               {
-                       // ignore
-               }
-               else
-               {
-                       LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+               string k = substring(sa, 0, p);
+               string v = substring(sa, p + 1, -1);
+               bool handled = true;
+               switch (k) {
+                       case "timelimit":
+                       {
+                               cvar_set("timelimit", v);
+                               break;
+                       }
+                       case "leadlimit":
+                       {
+                               cvar_set("leadlimit", v);
+                               break;
+                       }
+                       case "pointlimit":
+                       case "fraglimit":
+                       case "lives":
+                       case "laplimit":
+                       case "caplimit":
+                       {
+                               fraglimit_normal = v;
+                               break;
+                       }
+                       case "teampointlimit":
+                       case "teamlaplimit":
+                       {
+                               fraglimit_teams = v;
+                               break;
+                       }
+                       default:
+                       {
+                           handled = false;
+                           break;
+                       }
                }
+               FOREACH(Gametypes, true, LAMBDA(handled |= it.m_parse_mapinfo(k, v)));
+               if (!handled)
+            LOG_WARNINGF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa);
        }
 
-       if(pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2)
+       if (pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2)
        {
                if(fraglimit_teams)
                        cvar_set("fraglimit", fraglimit_teams);
@@ -707,6 +685,12 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
        }
 }
 
+Gametype MapInfo_Type(int t)
+{
+       FOREACH(Gametypes, it.items == t, LAMBDA(return it));
+       return NULL;
+}
+
 int MapInfo_Type_FromString(string t)
 {
 #define deprecate(from, to) do { \