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

LaunchLightning: don't set launcher when called from effect/proplist to prevent syntax error (related to PR #61) 

Setting the launcher to a non-object would throw an error later when being passed to Find_Exclude.
install-platforms
David Dormagen 2017-12-27 13:57:20 +01:00
parent 993d8c4565
commit de2b44c126
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
planet/Objects.ocd/Environment.ocd/Cloud.ocd/Lightning.ocd/Script.c
View File

@ -22,7 +22,11 @@ local launcher;
global func LaunchLightning(int x, int y, int strength, int xdir, int ydir, int xdev, int ydev, bool no_sound)
{
var lightning = CreateObject(Lightning, x - GetX(), y - GetY());
return lightning && lightning->Launch(x, y, strength, xdir, ydir, xdev, ydev, no_sound, this);
// Ignore the launching object if not called from effect, scenario, etc..
var launching_object = nil;
if (this && GetType(this) == C4D_Object)
launching_object = this;
return lightning && lightning->Launch(x, y, strength, xdir, ydir, xdev, ydev, no_sound, launching_object);
}
public func Launch(int x, int y, int to_strength, int to_xdir, int to_ydir, int to_xdev, int to_ydev, bool no_sound, to_launcher)