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 during item transformation on attached items

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-05-10 13:10:37 +00:00
parent 9149dbe850
commit ad8b2525a9
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+3
View File
@@ -14704,6 +14704,9 @@ BOOLEAN OBJECTTYPE::TransformObject( SOLDIERTYPE * pSoldier, UINT8 ubStatusIndex
// Test the parent now. See whether all attachments are still valid on it.
ReInitMergedItem(pSoldier, pParent, pParent->usItem, ubStatusIndex);
// Flugente: sometimes gpItemDescObject gets corrupted during ReInitMergedItem(...), so we have to repair that here
gpItemDescObject = &gCloneItemDescObject;
gpItemDescOrigAttachmentObject = NULL;
// After reiniting the attachments on the parent, "this" still exists, but the actual object is gone.