diff --git a/GameVersion.cpp b/GameVersion.cpp index 8930ea72..188b1f64 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.325" }; + INT16 zVersionLabel[256] = { L"Release v1.13.328" }; #endif diff --git a/JA2.vcproj b/JA2.vcproj index 14512fb5..a7639875 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -43,7 +43,7 @@ = 1 && sSectorX <= 16 ); + Assert( sSectorY >= 1 && sSectorY <= 16 ); + + //Now count the number of mobile groups in the sector. + *pubNumTroops = *pubNumElites = *pubNumAdmins = 0; + pGroup = gpGroupList; + while( pGroup ) + { + if( !pGroup->fPlayer && !pGroup->fVehicle && pGroup->ubSectorX == sSectorX && pGroup->ubSectorY == sSectorY ) + { + *pubNumTroops += pGroup->pEnemyGroup->ubNumTroops; + *pubNumElites += pGroup->pEnemyGroup->ubNumElites; + *pubNumAdmins += pGroup->pEnemyGroup->ubNumAdmins; + } + pGroup = pGroup->next; + } +} + + void GetNumberOfStationaryEnemiesInSector( INT16 sSectorX, INT16 sSectorY, UINT8 *pubNumAdmins, UINT8 *pubNumTroops, UINT8 *pubNumElites ) { SECTORINFO *pSector; diff --git a/Strategic/Queen Command.h b/Strategic/Queen Command.h index 998d95b1..df109b58 100644 --- a/Strategic/Queen Command.h +++ b/Strategic/Queen Command.h @@ -23,6 +23,7 @@ UINT8 NumEnemiesInSector( INT16 sSectorX, INT16 sSectorY ); UINT8 NumStationaryEnemiesInSector( INT16 sSectorX, INT16 sSectorY ); UINT8 NumMobileEnemiesInSector( INT16 sSectorX, INT16 sSectorY ); void GetNumberOfMobileEnemiesInSector( INT16 sSectorX, INT16 sSectorY, UINT8 *pubNumAdmins, UINT8 *pubNumTroops, UINT8 *pubNumElites ); +void GetNumberOfMobileEnemiesInSectorWithoutRoadBlock( INT16 sSectorX, INT16 sSectorY, UINT8 *pubNumAdmins, UINT8 *pubNumTroops, UINT8 *pubNumElites ); void GetNumberOfStationaryEnemiesInSector( INT16 sSectorX, INT16 sSectorY, UINT8 *pubNumAdmins, UINT8 *pubNumTroops, UINT8 *pubNumElites ); void GetNumberOfEnemiesInSector( INT16 sSectorX, INT16 sSectorY, UINT8 *pubNumAdmins, UINT8 *pubNumTroops, UINT8 *pubNumElites ); diff --git a/Strategic/Reinforcement.cpp b/Strategic/Reinforcement.cpp index 41953b65..4eafb80f 100644 --- a/Strategic/Reinforcement.cpp +++ b/Strategic/Reinforcement.cpp @@ -74,7 +74,7 @@ void GetNumberOfEnemiesInFiveSectors( INT16 sSectorX, INT16 sSectorY, UINT8 *pub } - GetNumberOfMobileEnemiesInSector( SECTORX( pusMoveDir[ ubIndex ][ 0 ] ), SECTORY( pusMoveDir[ ubIndex ][ 0 ] ), &ubNumAdmins, &ubNumTroops, &ubNumElites ); + GetNumberOfMobileEnemiesInSectorWithoutRoadBlock( SECTORX( pusMoveDir[ ubIndex ][ 0 ] ), SECTORY( pusMoveDir[ ubIndex ][ 0 ] ), &ubNumAdmins, &ubNumTroops, &ubNumElites ); *pubNumAdmins += ubNumAdmins; *pubNumTroops += ubNumTroops;