From d3d06bced6fff6d1ec7a8f510fb1103db09e5abd Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Tue, 5 Oct 2021 07:29:05 +0000 Subject: [PATCH] Mercs with the tag in their background don't automatically consume drugs/alcohol if they are asleep (by rftr). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9174 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Hourly Update.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Strategic/Hourly Update.cpp b/Strategic/Hourly Update.cpp index a7d1d352..c3e1971b 100644 --- a/Strategic/Hourly Update.cpp +++ b/Strategic/Hourly Update.cpp @@ -376,7 +376,7 @@ void HourlyLarryUpdate() { pSoldier = MercPtrs[ cnt ]; - if ( pSoldier && pSoldier->bActive && ( pSoldier->ubProfile == LARRY_NORMAL || pSoldier->ubProfile == LARRY_DRUNK || pSoldier->HasBackgroundFlag( BACKGROUND_DRUGUSE ) ) ) + if ( pSoldier && pSoldier->bActive && !pSoldier->flags.fMercAsleep && ( pSoldier->ubProfile == LARRY_NORMAL || pSoldier->ubProfile == LARRY_DRUNK || pSoldier->HasBackgroundFlag( BACKGROUND_DRUGUSE ) ) ) { fTookDrugs = FALSE;