1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: After restarting the game and loading a savegame the reinforcement option was always TRUE because it didn't take DifficultySettings.xml into account.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8191 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2016-05-04 11:23:03 +00:00
parent c969dce2b3
commit 67927ed723
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+9 -9
View File
@@ -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
SaveLoadGame.cpp
+3
View File
@@ -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 );
}