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

Fix: UB compilation

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-03-04 17:11:56 +00:00
parent f45c0a3544
commit a95c4fd614
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Ja25 Strategic Ai.cpp
+16 -16
View File
@@ -2191,26 +2191,26 @@ if ( gGameUBOptions.pJA2UB == TRUE )
BOOLEAN HandleAddEnemiesToSectorPlayerIsntIn( INT16 sSaiSector, UINT8 ubNumEnemies ) 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 ) 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 ) ) if( !( gTacticalStatus.uiFlags & INCOMBAT ) )
{ {
gubEnemyEncounterCode = ENEMY_INVASION_CODE; 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 ); return( TRUE );
} }
@@ -2296,7 +2296,7 @@ if ( gGameUBOptions.pJA2UB == TRUE )
SetGroupArrivalTime( pGroup, uiWorldMin + 1 ); SetGroupArrivalTime( pGroup, uiWorldMin + 1 );
pGroup->ubMoveType = ONE_WAY; pGroup->ubMoveType = ONE_WAY;
gubEnemyEncounterCode = ENEMY_INVASION_CODE; SetEnemyEncounterCode( ENEMY_INVASION_CODE );
if( gJa25AiSectorStruct[ sSaiSector ].bSectorZ == 0 ) if( gJa25AiSectorStruct[ sSaiSector ].bSectorZ == 0 )
{ {