mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
Mercs with the <druguse> 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
This commit is contained in:
@@ -376,7 +376,7 @@ void HourlyLarryUpdate()
|
|||||||
{
|
{
|
||||||
pSoldier = MercPtrs[ cnt ];
|
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;
|
fTookDrugs = FALSE;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user