1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

BUGZILLA #557: Fixed CTD when entering Estoni I6 (fix by TheBob)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4595 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-08-01 20:41:58 +00:00
parent b16577d82a
commit fa20d0c079
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+10 -5
View File
@@ -6295,12 +6295,17 @@ BOOLEAN AutoPlaceObjectToWorld(SOLDIERTYPE * pSoldier, OBJECTTYPE * pObj, INT8 b
if( guiCurrentScreen == MAP_SCREEN ) if( guiCurrentScreen == MAP_SCREEN )
{ {
if(fShowMapInventoryPool && !IsMercInActiveSector(pSoldier) ) // the_bob : added the check for whether pSoldier actually points to something to handle calling this function with pSoldier = NULL
{ if (pSoldier){
fShowMapInventoryPool = FALSE; if(fShowMapInventoryPool && !IsMercInActiveSector(pSoldier) )
CreateDestroyMapInventoryPoolButtons(FALSE); {
fShowMapInventoryPool = FALSE;
CreateDestroyMapInventoryPoolButtons(FALSE);
}
ChangeSelectedMapSector(pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ);
} }
ChangeSelectedMapSector(pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ);
if(!fShowMapInventoryPool) if(!fShowMapInventoryPool)
{ {
fShowMapInventoryPool = TRUE; fShowMapInventoryPool = TRUE;