From 61e6f4e98a2f62a97b1ffe8725bbd695add71469 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Thu, 29 Apr 2021 06:09:23 +0000 Subject: [PATCH] Fix for filling canteens during combat (by Shadooow). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8987 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Food.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/Food.cpp b/Tactical/Food.cpp index da6eff23..032a8233 100644 --- a/Tactical/Food.cpp +++ b/Tactical/Food.cpp @@ -791,7 +791,7 @@ void SectorFillCanteens( void ) { // no functionality if not in tactical or in combat, or nobody is here // can be called from a messagebox, thus the check for MSG_BOX_SCREEN - if ( (guiCurrentScreen != GAME_SCREEN && guiCurrentScreen != MSG_BOX_SCREEN) || (gTacticalStatus.uiFlags & INCOMBAT) || gusSelectedSoldier == NOBODY ) + if ( (guiCurrentScreen != GAME_SCREEN && guiCurrentScreen != MSG_BOX_SCREEN) || (gTacticalStatus.uiFlags & INCOMBAT) || gTacticalStatus.fEnemyInSector || gusSelectedSoldier == NOBODY ) return; // determine if there are any patches of water in this sector.