From 6ca75431aed49cecd5b8cb7cd0b7afa297fd82ca Mon Sep 17 00:00:00 2001 From: Shadooow Date: Mon, 31 Jan 2022 03:39:50 +0000 Subject: [PATCH] Disallowed to pick up items from openable structures like crates if they are currently closed. This additionally fixes bug where Bobby Ray's delivery wouldn't show up if the player had sector of the delivery currently loaded and there were any unpicked items from previous delivery in the delivery crate. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9285 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Turn Based Input.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index 2149c115..94a1f6a9 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -6018,7 +6018,7 @@ INT8 HandleMoveModeInteractiveClick( INT32 usMapPos, UINT32 *puiNewEvent ) // Check if we are over an item pool, take precedence over that..... // EXCEPT FOR SWITCHES! - if ( GetItemPool( sIntTileGridNo, &pItemPool, pSoldier->pathing.bLevel ) && !( pStructure->fFlags & ( STRUCTURE_SWITCH | STRUCTURE_ANYDOOR ) ) ) + if ((pStructure->fFlags & STRUCTURE_OPEN || !(pStructure->fFlags & STRUCTURE_OPENABLE)) && !(pStructure->fFlags & (STRUCTURE_SWITCH|STRUCTURE_ANYDOOR)) && GetItemPool(sIntTileGridNo, &pItemPool, pSoldier->pathing.bLevel)) { if ( AM_AN_EPC( pSoldier ) ) {