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

removed copy&paste code in the cannon

Tobias Zwick 2010-09-20 01:08:16 +02:00
parent 506767d127
commit 8d7d4ca3dc
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
planet/Objects.c4d/Vehicles.c4d/Cannon.c4d/Script.c
View File

@ -40,29 +40,15 @@ private func MaxContentsCount() { return 1; }
public func ControlUseStart(object clonk, int ix, int iy)
{
var result = CheckForKeg(clonk);
if (!result)
{
clonk->CancelUse();
return true;
}
if (!clonk->GetItem(0))
{
PlayerMessage(clonk->GetOwner(),"$TxtNeedsAmmo$");
clonk->CancelUse();
return true;
}
if(clonk->GetOwner() != GetOwner()) SetOwner(clonk->GetOwner());
//Animation
var r = ConvertAngle(Angle(0,0,ix,iy));
SetAnimationPosition(aim_anim, Anim_Const(AnimAngle(r)*3954444/100000)); //conversion. Apparently 90 blender frames is 3559 ogre frames.
return true;
return UseAnyStart(clonk,ix,iy,0);
}
public func ControlUseAltStart(object clonk, int ix, int iy)
{
return UseAnyStart(clonk,ix,iy,1);
}
private func UseAnyStart(object clonk, int ix, int iy, int item)
{
var result = CheckForKeg(clonk);
if (!result)
@ -71,7 +57,7 @@ public func ControlUseAltStart(object clonk, int ix, int iy)
return true;
}
if (!clonk->GetItem(1))
if (!clonk->GetItem(item))
{
PlayerMessage(clonk->GetOwner(),"$TxtNeedsAmmo$");
clonk->CancelUse();