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

Fixed Daily Expenses to no longer count salary of dead mercs or POW NPCs and RPCs.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9263 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2022-01-18 07:53:06 +00:00
parent b06b9132a7
commit bbd6b1393f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+2 -4
View File
@@ -3309,7 +3309,6 @@ void DisplayCharacterInfo( void )
// is displayed behind the current stat value, as see on the character's info panel. // 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. // 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. // 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 ]; SOLDIERTYPE *pSoldier = MercPtrs[ gCharactersList[bSelectedInfoChar].usSolID ];
@@ -6244,8 +6243,7 @@ void DrawAssignment(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont)
} }
} }
if ( gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS] && if ( pSoldier->bAssignment >= TRAIN_SELF &&
pSoldier->bAssignment >= TRAIN_SELF &&
pSoldier->bAssignment <= TRAIN_BY_OTHER && pSoldier->bAssignment <= TRAIN_BY_OTHER &&
pSoldier->bAssignment != TRAIN_TEAMMATE ) 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; iTotalCost += gMercProfiles[ pSoldier->ubProfile ].sSalary;
} }