From e48c16eb67e1a94f1d88c5ebc84244065f78a0d5 Mon Sep 17 00:00:00 2001 From: rftr Date: Mon, 21 Mar 2022 05:33:54 +0000 Subject: [PATCH] fix: load feature flags after external options are loaded git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9336 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- MainMenuScreen.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MainMenuScreen.cpp b/MainMenuScreen.cpp index 733f7542..656e804b 100644 --- a/MainMenuScreen.cpp +++ b/MainMenuScreen.cpp @@ -372,7 +372,6 @@ void InitDependingGameStyleOptions() // WANNE: Initialize again, because if differs from SP to MP game! LoadGameSettings(); - LoadFeatureFlags(); FreeGameExternalOptions(); @@ -380,6 +379,8 @@ void InitDependingGameStyleOptions() LoadGameAPBPConstants(); // Load ja2_options.ini LoadGameExternalOptions(); + // Load feature flags after external options, since it overwrites them (if enabled) + LoadFeatureFlags(); // Load new STOMP ini - SANDRO LoadSkillTraitsExternalSettings(); // HEADROCK HAM 4: CTH constants