mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
Fix: during hiring, AIM mercs only complained about their hated ones if these were already in the country, thus ignoring other mercs in transit
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -3217,7 +3217,7 @@ BOOLEAN CanMercBeHired()
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( IsMercOnTeam( bMercID, TRUE, FALSE ) )
|
if( IsMercOnTeam( bMercID, FALSE, FALSE ) )
|
||||||
{
|
{
|
||||||
//if the merc hates someone on the team, see if a buddy is on the team
|
//if the merc hates someone on the team, see if a buddy is on the team
|
||||||
for ( UINT8 j = 0; j< NUMBER_HATED_MERCS_ONTEAM; ++j )
|
for ( UINT8 j = 0; j< NUMBER_HATED_MERCS_ONTEAM; ++j )
|
||||||
|
|||||||
Reference in New Issue
Block a user