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

fix airplane control use coordinate forwarding

install-platforms
Maikel de Vries 2017-11-15 20:30:14 +01:00
parent 3a47802702
commit 0e6f1599c6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
View File

@ -287,20 +287,20 @@ public func ToggleMainAction(object clonk)
// Main action
public func ContainedUseStart(object clonk, int x, int y)
{
var call = Format("Use%s", main_action, x, y);
return this->Call(call, clonk);
var call = Format("Use%s", main_action);
return this->Call(call, clonk, x, y);
}
public func ContainedUseStop(object clonk, int x, int y)
{
var call = Format("Cancel%s", main_action, x, y);
return this->Call(call, clonk);
var call = Format("Cancel%s", main_action);
return this->Call(call, clonk, x, y);
}
public func ContainedUseCancel(object clonk, int x, int y)
{
var call = Format("Cancel%s", main_action, x, y);
return this->Call(call, clonk);
var call = Format("Cancel%s", main_action);
return this->Call(call, clonk, x, y);
}
// Alt Use: toggle firing mode
@ -567,18 +567,18 @@ public func FireRocket(object rocket, int x, int y)
var launch_y = Sin(GetR() - 180 * (1 - dir), 10);
rocket->Exit(launch_x, launch_y, GetR(), GetXDir(), GetYDir());
rocket->Launch(GetR(), nil, this);
var effect = AddEffect("IntControlRocket", rocket, 100, 1, this);
effect.x = GetX() + x;
effect.y = GetY() + y;
var fx = AddEffect("IntControlRocket", rocket, 100, 1, this);
fx.x = GetX() + x;
fx.y = GetY() + y;
rocket->SetDirectionDeviation(0);
}
public func FxIntControlRocketTimer(object target, proplist effect, int time)
public func FxIntControlRocketTimer(object target, effect fx, int time)
{
// Remove gravity on rocket.
target->SetYDir(target->GetYDir(100) - GetGravity(), 100);
// Adjust angle to target.
var angle_to_target = Angle(target->GetX(), target->GetY(), effect.x, effect.y);
var angle_to_target = Angle(target->GetX(), target->GetY(), fx.x, fx.y);
var angle_rocket = target->GetR();
if (angle_rocket < 0)
angle_rocket += 360;