From 7e9d4404fbd602050e843cb2169f8afab4163b11 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 26 Jan 2014 14:28:53 +0100 Subject: [PATCH] Fix error handling in "gametype" keyword parsing, fixes #1884. --- qcsrc/common/mapinfo.qc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 8493887ca..feb0e0364 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -602,14 +602,11 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType) 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") { @@ -645,7 +642,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType) } else { - print("Invalid gametype key in mapinfo: ", k, "\n"); + print("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n"); } } -- 2.39.2