marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

S2Fix

shapetextures
Clonkonaut 2015-09-03 20:04:56 +02:00
parent 12e1156fd3
commit 5f4978d3e6
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/object/C4Object.cpp
View File

@ -1843,17 +1843,12 @@ void C4Object::ClearPointers(C4Object *pObj)
// contents/contained: although normally not necessery because it's done in AssignRemoval and StatusDeactivate,
// it is also required during game destruction (because ClearPointers might do script callbacks)
// Perform silent exit to avoid additional callbacks
if (Contained)
if (Contained == pObj)
{
Contained->Contents.Remove(this);
Contained = NULL;
}
while (Contents.First)
{
assert(Contents.First->Obj);
Contents.First->Obj->Contained = NULL;
Contents.Remove(Contents.First->Obj);
}
Contents.Remove(pObj);
// Action targets
if (Action.Target==pObj) Action.Target=NULL;
if (Action.Target2==pObj) Action.Target2=NULL;