1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: The invisible troops fix from r8131 caused defending troops to be handled as reinforcements and appear at the map border instead of the pre-defined positions across the map. This was caused by unpausing the game before the troops had been placed. This revision fixes that and hopefully doesn't break anything else.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8162 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2016-04-18 21:21:53 +00:00
parent 26db62bd19
commit 14ccc1193b
3 changed files with 13 additions and 10 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 JA2EDITOR
#ifdef JA2UB #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 #else
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8131 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8155 (Development Build)" };
#endif #endif
// ------------------------------ // ------------------------------
@@ -27,11 +27,11 @@
//DEBUG BUILD VERSION //DEBUG BUILD VERSION
#ifdef JA2UB #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) #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 #else
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8131 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8155 (Development Build)" };
#endif #endif
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
#ifdef JA2UB #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) #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 #else
CHAR16 zVersionLabel[256] = { L"Release v1.13.8131 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release v1.13.8155 (Development Build)" };
#endif #endif
#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" }; CHAR16 zTrackingNumber[16] = { L"Z" };
// SAVE_GAME_VERSION is defined in header, change it there // SAVE_GAME_VERSION is defined in header, change it there
Strategic/Queen Command.cpp
+4
View File
@@ -642,6 +642,7 @@ BOOLEAN PrepareEnemyForSectorBattle()
} }
ValidateEnemiesHaveWeapons(); ValidateEnemiesHaveWeapons();
UnPauseGame();
return ( ( BOOLEAN) ( gpBattleGroup->ubGroupSize > 0 ) ); return ( ( BOOLEAN) ( gpBattleGroup->ubGroupSize > 0 ) );
} }
@@ -772,6 +773,7 @@ BOOLEAN PrepareEnemyForSectorBattle()
return FALSE; return FALSE;
AddSoldierInitListEnemyDefenceSoldiers( ubTotalAdmins, ubTotalTroops, ubTotalElites, ubTotalTanks, ubTotalJeeps ); AddSoldierInitListEnemyDefenceSoldiers( ubTotalAdmins, ubTotalTroops, ubTotalElites, ubTotalTanks, ubTotalJeeps );
ValidateEnemiesHaveWeapons(); ValidateEnemiesHaveWeapons();
UnPauseGame();
return TRUE; return TRUE;
} }
#endif #endif
@@ -1029,6 +1031,7 @@ BOOLEAN PrepareEnemyForSectorBattle()
} }
ValidateEnemiesHaveWeapons(); ValidateEnemiesHaveWeapons();
UnPauseGame();
return TRUE; return TRUE;
} }
@@ -1059,6 +1062,7 @@ BOOLEAN PrepareEnemyForUndergroundBattle()
pUnderground->ubJeepsInBattle += ubTotalJeeps; pUnderground->ubJeepsInBattle += ubTotalJeeps;
AddSoldierInitListEnemyDefenceSoldiers( pUnderground->ubNumAdmins, pUnderground->ubNumTroops, pUnderground->ubNumElites, pUnderground->ubNumTanks, pUnderground->ubNumJeeps ); AddSoldierInitListEnemyDefenceSoldiers( pUnderground->ubNumAdmins, pUnderground->ubNumTroops, pUnderground->ubNumElites, pUnderground->ubNumTanks, pUnderground->ubNumJeeps );
ValidateEnemiesHaveWeapons(); ValidateEnemiesHaveWeapons();
UnPauseGame();
} }
return ((BOOLEAN)(pUnderground->ubNumAdmins + pUnderground->ubNumTroops + pUnderground->ubNumElites + pUnderground->ubNumTanks + pUnderground->ubNumJeeps > 0)); return ((BOOLEAN)(pUnderground->ubNumAdmins + pUnderground->ubNumTroops + pUnderground->ubNumElites + pUnderground->ubNumTanks + pUnderground->ubNumJeeps > 0));
} }
Strategic/mapscreen.cpp
-1
View File
@@ -8778,7 +8778,6 @@ INT32 iCounter2 = 0;
{ {
// set compressed mode to Normal (X1) // set compressed mode to Normal (X1)
SetGameTimeCompressionLevel( TIME_COMPRESS_X1 ); SetGameTimeCompressionLevel( TIME_COMPRESS_X1 );
UnPauseGame();
} }
else // going to another screen (options, laptop, save/load) else // going to another screen (options, laptop, save/load)
{ {