diff --git a/GameVersion.cpp b/GameVersion.cpp index 8d351a26..520b75c9 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.8126 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8131 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8126 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8131 (Development Build)" }; #endif // ------------------------------ @@ -27,11 +27,11 @@ //DEBUG BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8126 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8131 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8126 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8131 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8126 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8131 (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.8126 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8131 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8126 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8131 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Release v1.13.8126 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.8131 (Development Build)" }; #endif #endif -CHAR8 czVersionNumber[16] = { "Build 16.03.26" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 16.03.29" }; //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 81da3f7e..f47fee02 100644 --- a/Strategic/Queen Command.cpp +++ b/Strategic/Queen Command.cpp @@ -1614,7 +1614,8 @@ void AddPossiblePendingEnemiesToBattle() } ubSlots = NumFreeSlots( ENEMY_TEAM ); - if(gGameExternalOptions.sMinDelayEnemyReinforcements)//dnl ch68 080913 + // silversurfer: Only if there are enemy troops in the sector already we can talk about "reinforcements". If no troops are there we will spawn the incoming troops without delay. + if( gGameExternalOptions.sMinDelayEnemyReinforcements && gTacticalStatus.Team[ENEMY_TEAM].bTeamActive )//dnl ch68 080913 { if(gTacticalStatus.Team[ENEMY_TEAM].bAwareOfOpposition == TRUE) { diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 279b0e91..04d8a794 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -8778,6 +8778,7 @@ INT32 iCounter2 = 0; { // set compressed mode to Normal (X1) SetGameTimeCompressionLevel( TIME_COMPRESS_X1 ); + UnPauseGame(); } else // going to another screen (options, laptop, save/load) {