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

Fixed a few C4Script runtime errors

Maikel de Vries 2012-10-22 20:24:57 +02:00
parent be410432a8
commit 930505ee0d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/BalloonDeployed.ocd/Script.c
View File

@ -79,8 +79,11 @@ public func OnProjectileHit()
//Pop!
CastParticles("Air",20,5,0,-10,170,190,RGB(255,255,255),RGB(255,255,255));
Sound("BalloonPop");
if(rider!=nil) rider->SetAction("Tumble");
rider->SetSpeed(GetXDir(),GetYDir());
if (rider)
{
rider->SetAction("Tumble");
rider->SetSpeed(GetXDir(),GetYDir());
}
parent->RemoveObject();
RemoveObject();
}

2
planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Shrapnel.ocd/Script.c
View File

@ -12,7 +12,7 @@ protected func Initialize()
public func Launch(int shooter)
{
SetController(shooter);
AddEffect("HitCheck", this, 1,1, nil,nil, shooter);
AddEffect("HitCheck", this, 1,1, nil, nil);
}
protected func FxFadeTimer(object target, int num, int timer)

2
planet/System.ocg/HitChecks.c
View File

@ -15,7 +15,7 @@ global func FxHitCheckStart(object target, proplist effect, int temp, object by_
return;
effect.x = target->GetX();
effect.y = target->GetY();
if (!by_obj)
if (!by_obj || GetType(by_obj) != C4V_C4Object)
by_obj = target;
if (by_obj->Contained())
by_obj = by_obj->Contained();