From: Mario <mario.mario@y7mail.com>
Date: Tue, 14 Jul 2020 18:28:13 +0000 (+1000)
Subject: Fix replacement gametype names not being applied
X-Git-Tag: xonotic-v0.8.5~870
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e5a2cbaa9e68e0ab3d018d9fc4b802061436091b;p=xonotic%2Fxonotic-data.pk3dir.git

Fix replacement gametype names not being applied
---

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index ae387e3db..c9e509907 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -601,9 +601,10 @@ Gametype MapInfo_Type_FromString(string gtype)
 		case "assault":   replacement = "as"; break;
 		case "race":      replacement = "rc"; break;
 	}
-	if (replacement != "" && WARN_COND)
+	if (replacement != "")
 	{
-		LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, gtype, replacement);
+		if (WARN_COND)
+			LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, gtype, replacement);
 		gtype = replacement;
 	}
 	FOREACH(Gametypes, it.mdl == gtype, return it);