Use SoldierID

This commit is contained in:
Asdow
2024-11-30 16:07:36 +02:00
parent d244ef4c91
commit 4645a09722
9 changed files with 79 additions and 72 deletions
+4 -4
View File
@@ -904,12 +904,12 @@ UINT8 CalcDesireToTalk( UINT8 ubNPC, UINT8 ubMerc, INT8 bApproach )
// SANDRO - bonus for communication with people for assertive people
if ( gGameOptions.fNewTraitSystem && bApproach != APPROACH_THREATEN)
{
INT16 id = GetSoldierIDFromMercID( ubMerc );
if ( id > -1 )
SoldierID id = GetSoldierIDFromMercID( ubMerc );
if ( id != NOBODY )
{
if ( DoesMercHavePersonality( MercPtrs[id], CHAR_TRAIT_ASSERTIVE ) )
if ( DoesMercHavePersonality( id, CHAR_TRAIT_ASSERTIVE ) )
iPersonalVal += 50;
else if ( DoesMercHavePersonality( MercPtrs[id], CHAR_TRAIT_MALICIOUS ) )
else if ( DoesMercHavePersonality( id, CHAR_TRAIT_MALICIOUS ) )
iPersonalVal -= 50;
}
}