From 2350780db0e5b3e3206bb91e5c15379726454c34 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 17 Sep 2021 23:04:13 +0200 Subject: [PATCH] - fixed: "Dialogue" in MAPINFO must clear all "AddDialogues" that came before. --- src/gamedata/gi.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gamedata/gi.cpp b/src/gamedata/gi.cpp index 667e0d136fe..eaff1cf3508 100644 --- a/src/gamedata/gi.cpp +++ b/src/gamedata/gi.cpp @@ -356,6 +356,12 @@ void FMapInfoParser::ParseGameInfo() } else gameinfo.mCheatMapArrow = ""; } + else if (nextKey.CompareNoCase("dialogue") == 0) + { + sc.MustGetToken(TK_StringConst); + gameinfo.Dialogue = sc.String; + gameinfo.AddDialogues.Clear(); + } // Insert valid keys here. GAMEINFOKEY_STRING(mCheatKey, "cheatKey") GAMEINFOKEY_STRING(mEasyKey, "easyKey") @@ -437,7 +443,6 @@ void FMapInfoParser::ParseGameInfo() GAMEINFOKEY_FONT(mStatscreenAuthorFont, "statscreen_authorfont") GAMEINFOKEY_BOOL(norandomplayerclass, "norandomplayerclass") GAMEINFOKEY_BOOL(forcekillscripts, "forcekillscripts") // [JM] Force kill scripts on thing death. (MF7_NOKILLSCRIPTS overrides.) - GAMEINFOKEY_STRING(Dialogue, "dialogue") GAMEINFOKEY_STRINGARRAY(AddDialogues, "adddialogues", 0, false) GAMEINFOKEY_STRING(statusscreen_single, "statscreen_single") GAMEINFOKEY_STRING(statusscreen_coop, "statscreen_coop")