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

Fix crash when using LOBOT with certain sti size and offset (by Asdow).

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8938 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-02-17 14:02:30 +00:00
parent 75f5f35ea0
commit c72300d51f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/structure.cpp
+8 -5
View File
@@ -2438,7 +2438,10 @@ BOOLEAN AddZStripInfoToVObject( HVOBJECT hVObject, STRUCTURE_FILE_REF * pStructu
// MemAlloc returns a NULL pointer which the code would interpret as
// allocation failing because of no memory.
// I hope this is OK, I don't entirely understand what is done here...
if (pCurr->ubNumberOfZChanges > 0)
// (ASDOW): Commented out the added conditional, because with an unlucky combination of sti image width and offset, eg 9x16 with x offset of -15
// pCurr->pbZChange would be null, which then crashes the game inside the blitting functions when dereferencing a nullptr
// With Bio experiencing crashes causing him to add the check, I don't know if this is just kicking the can down the road.
// if (pCurr->ubNumberOfZChanges > 0)
{
pCurr->pbZChange = (INT8 *)MemAlloc(pCurr->ubNumberOfZChanges);
if (pCurr->pbZChange == NULL)
@@ -2480,10 +2483,10 @@ BOOLEAN AddZStripInfoToVObject( HVOBJECT hVObject, STRUCTURE_FILE_REF * pStructu
pCurr->bInitialZChange = -(ubNumDecreasing);
}
}
else
{
pCurr->pbZChange = NULL;
}
// else
// {
// pCurr->pbZChange = NULL;
// }
}
}
}