From 67927ed723d231b7a327b2fae89847825bc789a1 Mon Sep 17 00:00:00 2001 From: silversurfer Date: Wed, 4 May 2016 11:23:03 +0000 Subject: [PATCH] Fix: After restarting the game and loading a savegame the reinforcement option was always TRUE because it didn't take DifficultySettings.xml into account. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8191 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 18 +++++++++--------- SaveLoadGame.cpp | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index f5c3eced..821f1398 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -15,9 +15,9 @@ #ifdef JA2EDITOR #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8155 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8188 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8155 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8188 (Development Build)" }; #endif // ------------------------------ @@ -27,11 +27,11 @@ //DEBUG BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8155 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8188 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8155 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8188 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8155 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8188 (Development Build)" }; #endif #elif defined CRIPPLED_VERSION @@ -46,16 +46,16 @@ //RELEASE BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8155 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8188 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8155 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8188 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Release v1.13.8155 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.8188 (Development Build)" }; #endif #endif -CHAR8 czVersionNumber[16] = { "Build 16.04.18" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 16.05.04" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/SaveLoadGame.cpp b/SaveLoadGame.cpp index 7c9da07d..d273241c 100644 --- a/SaveLoadGame.cpp +++ b/SaveLoadGame.cpp @@ -6550,6 +6550,9 @@ BOOLEAN LoadSavedGame( int ubSavedGameID ) } } + // Reinforcement parameter is not stored in the savegame so we have to reset it here. + gGameExternalOptions.gfAllowReinforcements = zDiffSetting[gGameOptions.ubDifficultyLevel].bAllowReinforcements; + return( TRUE ); }