diff --git a/GameVersion.cpp b/GameVersion.cpp index 520b75c9..f5c3eced 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.8131 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8155 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8131 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8155 (Development Build)" }; #endif // ------------------------------ @@ -27,11 +27,11 @@ //DEBUG BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8131 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8155 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8131 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8155 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8131 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8155 (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.8131 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8155 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8131 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8155 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Release v1.13.8131 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.8155 (Development Build)" }; #endif #endif -CHAR8 czVersionNumber[16] = { "Build 16.03.29" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 16.04.18" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp index f47fee02..0dcf41c9 100644 --- a/Strategic/Queen Command.cpp +++ b/Strategic/Queen Command.cpp @@ -642,6 +642,7 @@ BOOLEAN PrepareEnemyForSectorBattle() } ValidateEnemiesHaveWeapons(); + UnPauseGame(); return ( ( BOOLEAN) ( gpBattleGroup->ubGroupSize > 0 ) ); } @@ -772,6 +773,7 @@ BOOLEAN PrepareEnemyForSectorBattle() return FALSE; AddSoldierInitListEnemyDefenceSoldiers( ubTotalAdmins, ubTotalTroops, ubTotalElites, ubTotalTanks, ubTotalJeeps ); ValidateEnemiesHaveWeapons(); + UnPauseGame(); return TRUE; } #endif @@ -1029,6 +1031,7 @@ BOOLEAN PrepareEnemyForSectorBattle() } ValidateEnemiesHaveWeapons(); + UnPauseGame(); return TRUE; } @@ -1059,6 +1062,7 @@ BOOLEAN PrepareEnemyForUndergroundBattle() pUnderground->ubJeepsInBattle += ubTotalJeeps; AddSoldierInitListEnemyDefenceSoldiers( pUnderground->ubNumAdmins, pUnderground->ubNumTroops, pUnderground->ubNumElites, pUnderground->ubNumTanks, pUnderground->ubNumJeeps ); ValidateEnemiesHaveWeapons(); + UnPauseGame(); } return ((BOOLEAN)(pUnderground->ubNumAdmins + pUnderground->ubNumTroops + pUnderground->ubNumElites + pUnderground->ubNumTanks + pUnderground->ubNumJeeps > 0)); } diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 04d8a794..279b0e91 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -8778,7 +8778,6 @@ INT32 iCounter2 = 0; { // set compressed mode to Normal (X1) SetGameTimeCompressionLevel( TIME_COMPRESS_X1 ); - UnPauseGame(); } else // going to another screen (options, laptop, save/load) {