mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
Replaced
UINT8 CountAllMilitiaInSector(INT16 sMapX, INT16 sMapY); with UINT8 NumNonPlayerTeamMembersInSector( INT16 sSectorX, INT16 sSectorY, UINT8 ubTeam ); git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7708 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -31,6 +31,7 @@
|
||||
#include "Strategic AI.h"
|
||||
#include "MessageBoxScreen.h"
|
||||
#include "Map Information.h"
|
||||
#include "Queen Command.h"
|
||||
#endif
|
||||
|
||||
#include "Strategic Mines.h"
|
||||
@@ -1115,9 +1116,10 @@ void CreatureAttackTown( UINT8 ubSectorID, BOOLEAN fOverrideTest )
|
||||
gubCreatureBattleCode = CREATURE_BATTLE_CODE_PREBATTLEINTERFACE;
|
||||
}
|
||||
}
|
||||
else if( CountAllMilitiaInSector( ubSectorX, ubSectorY ) )
|
||||
{ //we have militia in the sector
|
||||
gubCreatureBattleCode = CREATURE_BATTLE_CODE_AUTORESOLVE;
|
||||
else if ( NumNonPlayerTeamMembersInSector( ubSectorX, ubSectorY, MILITIA_TEAM ) )
|
||||
{
|
||||
//we have militia in the sector
|
||||
gubCreatureBattleCode = CREATURE_BATTLE_CODE_AUTORESOLVE;
|
||||
}
|
||||
else if( !StrategicMap[ ubSectorX + MAP_WORLD_X * ubSectorY ].fEnemyControlled )
|
||||
{ //player controlled sector -- eat some civilians
|
||||
|
||||
Reference in New Issue
Block a user