From 679545563546dfdd64967d007f4b113d1e43714b Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 27 Apr 2012 20:18:34 +0000 Subject: [PATCH] - Bugfix: Fixed bug, that items get lost in the sector when switching between tactical sectors o This bug was a result of a "fix" from revision 4571 (2011-07-14) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5228 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Items.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 089599d92..6e6e4e9a5 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -6374,7 +6374,8 @@ BOOLEAN AutoPlaceObjectToWorld(SOLDIERTYPE * pSoldier, OBJECTTYPE * pObj, INT8 b if( guiCurrentScreen == MAP_SCREEN ) { // the_bob : added the check for whether pSoldier actually points to something to handle calling this function with pSoldier = NULL - if (pSoldier){ + if (pSoldier) + { if(fShowMapInventoryPool && !IsMercInActiveSector(pSoldier) ) { fShowMapInventoryPool = FALSE; @@ -6384,7 +6385,11 @@ BOOLEAN AutoPlaceObjectToWorld(SOLDIERTYPE * pSoldier, OBJECTTYPE * pObj, INT8 b ChangeSelectedMapSector(pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ); } - if(!fShowMapInventoryPool) + // WANNE: This should fix the bug, that items get lost in the sector when switching between tactical sectors + // This bug was introduced in revision 4571 (2011-07-14) + + //if(!fShowMapInventoryPool) + if(fShowMapInventoryPool) { fShowMapInventoryPool = TRUE; CreateDestroyMapInventoryPoolButtons(FALSE);