From a95c4fd614f7b6bef19648c59c95302b2dc0f617 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 4 Mar 2018 17:11:56 +0000 Subject: [PATCH] Fix: UB compilation git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8536 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Ja25 Strategic Ai.cpp | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Strategic/Ja25 Strategic Ai.cpp b/Strategic/Ja25 Strategic Ai.cpp index ef6fe149..3319de20 100644 --- a/Strategic/Ja25 Strategic Ai.cpp +++ b/Strategic/Ja25 Strategic Ai.cpp @@ -2190,27 +2190,27 @@ if ( gGameUBOptions.pJA2UB == TRUE ) } BOOLEAN HandleAddEnemiesToSectorPlayerIsntIn( INT16 sSaiSector, UINT8 ubNumEnemies ) -{ - INT16 sSectorX = SECTORX( gJa25AiSectorStruct[ sSaiSector ].iSectorID ); - INT16 sSectorY = SECTORY( gJa25AiSectorStruct[ sSaiSector ].iSectorID ); - INT8 bSectorZ = gJa25AiSectorStruct[ sSaiSector ].bSectorZ; - +{ if ( gGameUBOptions.pJA2UB == TRUE ) { + INT16 sSectorX = SECTORX( gJa25AiSectorStruct[sSaiSector].iSectorID ); + INT16 sSectorY = SECTORY( gJa25AiSectorStruct[sSaiSector].iSectorID ); + INT8 bSectorZ = gJa25AiSectorStruct[sSaiSector].bSectorZ; - if( !( gTacticalStatus.uiFlags & INCOMBAT ) ) - { - gubEnemyEncounterCode = ENEMY_INVASION_CODE; + if( !( gTacticalStatus.uiFlags & INCOMBAT ) ) + { + SetEnemyEncounterCode( ENEMY_INVASION_CODE ); + } + + SetNumberJa25EnemiesInSector( sSectorX, sSectorY, bSectorZ, 0, ubNumEnemies, 0, 0, 0 ); + + SetThisSectorAsEnemyControlled( sSectorX, sSectorY, bSectorZ, FALSE ); + + //Set up flag so enemies will go and find the player in that sector + gJa25SaveStruct.fEnemyShouldImmediatelySeekThePlayer = TRUE; + gJa25SaveStruct.bSectorTheEnemyWillSeekEnemy = (INT8)sSaiSector; } - SetNumberJa25EnemiesInSector( sSectorX, sSectorY, bSectorZ, 0, ubNumEnemies, 0, 0, 0 ); - - SetThisSectorAsEnemyControlled( sSectorX, sSectorY, bSectorZ, FALSE ); - - //Set up flag so enemies will go and find the player in that sector - gJa25SaveStruct.fEnemyShouldImmediatelySeekThePlayer = TRUE; - gJa25SaveStruct.bSectorTheEnemyWillSeekEnemy = (INT8)sSaiSector; - } return( TRUE ); } @@ -2296,7 +2296,7 @@ if ( gGameUBOptions.pJA2UB == TRUE ) SetGroupArrivalTime( pGroup, uiWorldMin + 1 ); pGroup->ubMoveType = ONE_WAY; - gubEnemyEncounterCode = ENEMY_INVASION_CODE; + SetEnemyEncounterCode( ENEMY_INVASION_CODE ); if( gJa25AiSectorStruct[ sSaiSector ].bSectorZ == 0 ) {