From 8e60b4d442d1160d281fa3a9b10b5d3decb6a351 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Tue, 18 Jan 2022 08:03:12 +0000 Subject: [PATCH] Fix&Revert of previous commit, I messed it up with my other edits in code that are not tested yet. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9264 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/mapscreen.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 17f8c2e20..9b5d20b37 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -3309,7 +3309,8 @@ 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; @@ -6243,7 +6244,8 @@ void DrawAssignment(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont) } } - if ( pSoldier->bAssignment >= TRAIN_SELF && + if ( gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS] && + pSoldier->bAssignment >= TRAIN_SELF && pSoldier->bAssignment <= TRAIN_BY_OTHER && pSoldier->bAssignment != TRAIN_TEAMMATE ) { @@ -16945,7 +16947,7 @@ INT32 GetTotalContractExpenses ( void ) } } } - else if(pSoldier->bAssignment != ASSIGNMENT_DEAD && (pSoldier->bAssignment != ASSIGNMENT_POW || pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__MERC)) + else if(pSoldier->bAssignment != ASSIGNMENT_DEAD && pSoldier->bAssignment != ASSIGNMENT_POW) { iTotalCost += gMercProfiles[ pSoldier->ubProfile ].sSalary; }