Merge remote-tracking branch 'origin/master' into samual/combined_updates

diff --combined qcsrc/common/mapinfo.qc
index 27b2b72f91a6255a863252e785c0273a9385c683,feb0e036420e49d47ce211390463ed8ccd951b9f..8af5b49fcf47c6219acf48c12db54a1c4f87e6c4
--- 1/qcsrc/common/mapinfo.qc
--- 2/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@@ -564,15 -564,6 +564,15 @@@ string _MapInfo_GetDefaultEx(float t
        return "";
  }
  
 +float _MapInfo_GetTeamPlayBool(float t)
 +{
 +      entity e;
 +      for(e = MapInfo_Type_first; e; e = e.enemy)
 +              if(t == e.items)
 +                      return e.team;
 +      return FALSE;
 +}
 +
  void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
  {
        string sa, k, v;
@@@ -611,14 -602,11 +611,11 @@@
                p = strstrofs(sa, "=", 0);
                if(p < 0)
                {
-                       k = "timelimit";
-                       v = s;
-               }
-               else
-               {
-                       k = substring(sa, 0, p);
-                       v = substring(sa, p+1, -1);
+                       print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
+                       continue;
                }
+               k = substring(sa, 0, p);
+               v = substring(sa, p+1, -1);
  
                if(k == "timelimit")
                {
@@@ -654,7 -642,7 +651,7 @@@
                }
                else
                {
-                       print("Invalid gametype key in mapinfo: ", k, "\n");
+                       print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n");
                }
        }