From: Mario <mario.mario@y7mail.com>
Date: Tue, 14 Jul 2020 17:38:30 +0000 (+1000)
Subject: Fix tabs messing up .arena file processing
X-Git-Tag: xonotic-v0.8.6~328^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5d20362550cb8a7318ec6b74645b61010a0144c;p=xonotic%2Fxonotic-data.pk3dir.git

Fix tabs messing up .arena file processing
---

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index d3d1f658b..60f5c40d1 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -604,8 +604,7 @@ Gametype MapInfo_Type_FromString(string gtype)
 		// quake 3 compat
 		case "ffa": 	  replacement = "dm"; do_warn = false; break;
 		case "cctf":
-		case "oneflag":
-		case "ctf": 	  replacement = "ctf"; do_warn = false; break;
+		case "oneflag":   replacement = "ctf"; do_warn = false; break;
 		case "team": 	  replacement = "tdm"; do_warn = false; break;
 		case "tourney":   replacement = "duel"; do_warn = false; break;
 	}
@@ -781,6 +780,7 @@ void _MapInfo_ParseArena(int fh, Gametype pGametypeToSet, bool isdefi)
 			continue;
 		if(s == "{" || s == "}")       // opening/closing brackets TODO: make sure we're checking this map's brackets! Q3 can have multiple
 			continue;
+		s = strreplace("\t", " ", s);
 
 		float p = strstrofs(s, "//", 0);
 		if(p >= 0)