From: Mario <mario.mario@y7mail.com>
Date: Mon, 27 Jul 2020 06:56:06 +0000 (+1000)
Subject: Merge branch 'master' into Mario/q3compat_sanity. Also store supported map features... 
X-Git-Tag: xonotic-v0.8.6~328^2~22
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=c43ec3808d34b0e19ce9c77e14f160e703671c0d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/q3compat_sanity. Also store supported map features when parsing .arena files to avoid applying them when parsing the wrong map's info
---

c43ec3808d34b0e19ce9c77e14f160e703671c0d
diff --cc qcsrc/common/mapinfo.qc
index 23de32c7c,dce55aa86..26eb8e4b6
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@@ -611,10 -589,9 +611,10 @@@ void _MapInfo_Map_ApplyGametypeEx(strin
  	}
  }
  
- Gametype MapInfo_Type_FromString(string gtype)
+ Gametype MapInfo_Type_FromString(string gtype, bool dowarn)
  {
  	string replacement = "";
 +	bool do_warn = true;
  	switch (gtype)
  	{
  		case "nexball":   replacement = "nb"; break;