From 17fab7ba83d5842478c3095424204e7d33134192 Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 28 Aug 2014 01:25:02 +0000 Subject: [PATCH] Fix: mercs move medical equipment into their hands on non-medical assignments git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7442 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Assignments.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index 630c213d6..c29ceaf97 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -5824,10 +5824,10 @@ void HandleDiseaseSectorTreatment() UINT32 uiCnt = 0; for ( uiCnt = 0, pSoldier = MercPtrs[uiCnt]; uiCnt <= gTacticalStatus.Team[gbPlayerNum].bLastID; ++uiCnt, pSoldier++ ) { - MakeSureMedKitIsInHand( pSoldier ); - if ( pSoldier->bActive && pSoldier->bAssignment == DISEASE_DOCTOR_SECTOR && CanCharacterTreatSectorDisease( pSoldier ) && !pSoldier->flags.fMercAsleep && EnoughTimeOnAssignment( pSoldier ) ) { + MakeSureMedKitIsInHand( pSoldier ); + // get available healing pts UINT16 max = 0; UINT16 ptsavailable = CalculateHealingPointsForDoctor( pSoldier, &max, TRUE );