From 65c99e02a35c1066663dbc13d8e54cf0a521d92f Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 3 Apr 2018 19:40:22 +0000 Subject: [PATCH] Fix: healing update relied on first merc git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8550 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Assignments.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index 6cc39bef7..70af69b36 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -4010,13 +4010,13 @@ void HandleDoctorMilitia() void UpdatePatientsWhoAreDoneHealing( void ) { INT32 cnt = 0; - SOLDIERTYPE *pSoldier = NULL, *pTeamSoldier = NULL; + SOLDIERTYPE *pTeamSoldier = NULL; BOOLEAN fHasDamagedStat = FALSE; // added by SANDRO // set as first in list - pSoldier = MercPtrs[0]; + pTeamSoldier = MercPtrs[0]; - for ( pTeamSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ pSoldier->bTeam ].bLastID; ++cnt, pTeamSoldier++) + for ( pTeamSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ OUR_TEAM ].bLastID; ++cnt, pTeamSoldier++) { // active soldier? if( pTeamSoldier->bActive ) @@ -4025,9 +4025,9 @@ void UpdatePatientsWhoAreDoneHealing( void ) if ( IS_PATIENT(pTeamSoldier->bAssignment) && !IS_DOCTOR(pTeamSoldier->bAssignment) && (pTeamSoldier->stats.bLife == pTeamSoldier->stats.bLifeMax) && pTeamSoldier->HasDisease(TRUE, TRUE) ) { // Flugente: stats can also be damaged - if ( !gGameOptions.fFoodSystem || (gGameOptions.fFoodSystem && pSoldier->bFoodLevel > FoodMoraleMods[FOOD_NORMAL].bThreshold && pSoldier->bDrinkLevel > FoodMoraleMods[FOOD_NORMAL].bThreshold) ) + if ( !gGameOptions.fFoodSystem || (gGameOptions.fFoodSystem && pTeamSoldier->bFoodLevel > FoodMoraleMods[FOOD_NORMAL].bThreshold && pTeamSoldier->bDrinkLevel > FoodMoraleMods[FOOD_NORMAL].bThreshold) ) { - if ( pSoldier->usStarveDamageHealth > 0 || pSoldier->usStarveDamageStrength > 0 ) + if ( pTeamSoldier->usStarveDamageHealth > 0 || pTeamSoldier->usStarveDamageStrength > 0 ) fHasDamagedStat = TRUE; }