mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
- bug fix: No militia are present in the sector (not city sector) for the battle, even though they do appear on the strategy map. Happens when mercs are in sector and a militia group arrives.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -546,6 +546,14 @@ void UpdateMilitiaSquads(INT16 sMapX, INT16 sMapY )
|
||||
MoveMilitiaSquad( sMapX, sMapY, SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ), FALSE );
|
||||
AddToBlockMoveList( SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ) );
|
||||
|
||||
if ( gWorldSectorX == SECTORX( pMoveDir[ iRandomRes ][0] ) &&
|
||||
gWorldSectorY == SECTORY( pMoveDir[ iRandomRes ][0] ) &&
|
||||
!gbWorldSectorZ )
|
||||
{
|
||||
gfStrategicMilitiaChangesMade = TRUE;
|
||||
ResetMilitia();
|
||||
}
|
||||
|
||||
if( NumEnemiesInSector( SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ) ) )
|
||||
{
|
||||
/* GROUP* pEnemyGroup = GetGroup( GetEnemyGroupIdInSector( SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ) ) );
|
||||
|
||||
Reference in New Issue
Block a user