From e2c1a333fad878b2464df9ed8a4e02f5d2ac36eb Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 7 Feb 2013 20:57:29 +0000 Subject: [PATCH] Fix: regeneration drug effect ended prematurely git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5853 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Drugs And Alcohol.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Tactical/Drugs And Alcohol.cpp b/Tactical/Drugs And Alcohol.cpp index a538d4fa..e967bf97 100644 --- a/Tactical/Drugs And Alcohol.cpp +++ b/Tactical/Drugs And Alcohol.cpp @@ -598,13 +598,13 @@ BOOLEAN MercUnderTheInfluence( SOLDIERTYPE *pSoldier ) { // Are we in a side effect or good effect? if ( pSoldier->drugs.bDrugEffect[ cnt ] ) - { return( TRUE ); - } - else if ( pSoldier->drugs.bDrugSideEffect[ cnt ] ) - { + + if ( pSoldier->drugs.bDrugSideEffect[ cnt ] ) + return( TRUE ); + + if ( pSoldier->bRegenerationCounter > 0) return( TRUE ); - } } return( FALSE );