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

fix splitting of lava bubbles

shapetextures
Maikel de Vries 2015-09-11 20:01:03 +02:00
parent 775820fd92
commit 9dda8d34dc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Bubble.ocd/Script.c
View File

@ -32,11 +32,15 @@ private func FxMoveTimer(object target, effect, int time)
for (var i = 0; i < 2; i++)
{
var bubble = CreateObjectAbove(GetID());
bubble->SetCon(2 * target->GetCon() / 3);
bubble->SetYDir(target->GetYDir());
// Bubble could have been removed in its construction call.
if (bubble)
{
bubble->SetCon(2 * target->GetCon() / 3);
bubble->SetYDir(target->GetYDir());
}
}
RemoveObject();
return -1;
return FX_Execute_Kill;
}
// Jittery movement
@ -48,7 +52,7 @@ private func FxMoveTimer(object target, effect, int time)
var prey = FindObject(Find_Distance(GetCon()/15, 0, 0), Find_OCF(OCF_Alive));
if(prey != nil)
Explode(10);
return 1;
return FX_OK;
}
// No need to blow up scenario object list with bubble spam.