1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix: Fixed bug, that items get lost in the sector when switching between tactical sectors

Browse Source 
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
This commit is contained in:
Wanne
2012-04-27 20:18:34 +00:00
parent fc88abaa5b
commit 6795455635
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+7 -2
View File
@@ -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);