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

- To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums.

Browse Source 
- Merged IsMercOnTeam...(...) functions into one
- 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@8512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-01-04 15:50:31 +00:00
parent f8b34b35d7
commit a8e62cc406
12 changed files with 50 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimMembers.cpp
+8 -8
View File
@@ -3217,7 +3217,7 @@ BOOLEAN CanMercBeHired()
continue;
}
if( IsMercOnTeamAndInOmertaAlready( bMercID ) )
if( IsMercOnTeam( bMercID, TRUE, FALSE ) )
{
//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 )
@@ -3239,7 +3239,7 @@ BOOLEAN CanMercBeHired()
if( bMercID < 0 )
continue;
if( IsMercOnTeam( bMercID ) && !IsMercDead( bMercID ) )
if( IsMercOnTeam( bMercID, FALSE, FALSE ) && !IsMercDead( bMercID ) )
{
if ( j == 0 )
{
@@ -3282,7 +3282,7 @@ BOOLEAN CanMercBeHired()
}
else
{
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_1 );
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_1_ON_TEAM_LONGTIMETOHATE );
fRetVal = TRUE;
}
}
@@ -3296,8 +3296,8 @@ BOOLEAN CanMercBeHired()
}
else
{
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_2 );
// DelayMercSpeech( gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_2, 750, TRUE, FALSE );
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_2_ON_TEAM_LONGTIMETOHATE );
// DelayMercSpeech( gbCurrentSoldier, QUOTE_HATED_2_ON_TEAM_LONGTIMETOHATE, 750, TRUE, FALSE );
fRetVal = TRUE;
}
}
@@ -3311,7 +3311,7 @@ BOOLEAN CanMercBeHired()
}
else
{
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_3 );
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_3_ON_TEAM_LONGTIMETOHATE );
fRetVal = TRUE;
}
}
@@ -3325,7 +3325,7 @@ BOOLEAN CanMercBeHired()
}
else
{
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_4 );
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_4_ON_TEAM_LONGTIMETOHATE );
fRetVal = TRUE;
}
}
@@ -3339,7 +3339,7 @@ BOOLEAN CanMercBeHired()
}
else
{
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_5 );
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_5_ON_TEAM_LONGTIMETOHATE );
fRetVal = TRUE;
}
}