From 494c4500e55c23b418343c4b952e5864558a7913 Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 29 Jan 2019 23:59:13 +0000 Subject: [PATCH] Fix: disease menu can be accessed in transit git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8657 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Assignments.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index c6c6cff8b..9f8eeece6 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -972,6 +972,18 @@ BOOLEAN CanCharacterDiagnoseDisease( SOLDIERTYPE *pSoldier ) if ( SPY_LOCATION( pSoldier->bAssignment ) ) return( FALSE ); + // in transit? + if ( IsCharacterInTransit( pSoldier ) ) + { + return FALSE; + } + + // character on the move? + if ( CharacterIsBetweenSectors( pSoldier ) ) + { + return FALSE; + } + // all criteria fit, can doctor return TRUE; }