From bbd6b1393ffc0b962d42ee0687ccb716bc2ec3e0 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Tue, 18 Jan 2022 07:53:06 +0000 Subject: [PATCH] Fixed Daily Expenses to no longer count salary of dead mercs or POW NPCs and RPCs. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9263 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/mapscreen.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 8fa876d2..17f8c2e2 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -3309,8 +3309,7 @@ void DisplayCharacterInfo( void ) // is displayed behind the current stat value, as see on the character's info panel. // This section draws STRATEGIC info pages. Another section is in Interface Panels.cpp and draws TACTICAL info pages. // The feature is toggled by Options-Menu switch, and its color is determined in the INI files. - if ( gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS] ) - { + { SOLDIERTYPE *pSoldier = MercPtrs[ gCharactersList[bSelectedInfoChar].usSolID ]; UINT8 *pDestBuf; @@ -6244,8 +6243,7 @@ void DrawAssignment(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont) } } - if ( gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS] && - pSoldier->bAssignment >= TRAIN_SELF && + if ( pSoldier->bAssignment >= TRAIN_SELF && pSoldier->bAssignment <= TRAIN_BY_OTHER && pSoldier->bAssignment != TRAIN_TEAMMATE ) { @@ -16947,7 +16945,7 @@ INT32 GetTotalContractExpenses ( void ) } } } - else + else if(pSoldier->bAssignment != ASSIGNMENT_DEAD && (pSoldier->bAssignment != ASSIGNMENT_POW || pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__MERC)) { iTotalCost += gMercProfiles[ pSoldier->ubProfile ].sSalary; }