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

clonk now turns automatically during UseHold. No need for that in the singe weapons anymore

Tobias Zwick 2010-02-25 12:47:13 +01:00
parent 780240bef3
commit ab7a8aac5c
6 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Script.c
View File

@ -103,15 +103,7 @@ public func ControlUseHolding(object clonk, int x, int y)
}
else
{
// Turn clonk if aiming in the other direction and he isn't moving
if(!ClonkAimLimit(clonk,angle))
if(clonk->GetComDir() == COMD_Stop && !clonk->GetXDir())
{
if(clonk->GetDir() == 1 && angle < 0) clonk->SetDir(0);
else if(clonk->GetDir() == 0 && angle > 0) clonk->SetDir(1);
}
if(Abs(angle) > 160) angle = 160;
// Adjust the aiming position
var pos = clonk->GetAnimationPosition(iAnimLoad);
pos += BoundBy(2000*Abs(angle)/180-pos, -100, 100);

6
planet/Objects.c4d/Items.c4d/Weapons.c4d/Club.c4d/Script.c
View File

@ -61,12 +61,6 @@ public func ControlUseHolding(object clonk, int x, int y)
clonk->SetAnimationWeight(iAimKnot, Anim_Const(Abs(angle)*1000/180));
// Turn clonk if aiming in the other direction and he isn't moving
if(clonk->GetComDir() == COMD_Stop && !clonk->GetXDir())
{
if(clonk->GetDir() == 1 && angle < 0) clonk->SetDir(0);
else if(clonk->GetDir() == 0 && angle > 0) clonk->SetDir(1);
}
}
protected func ControlUseStop(object clonk, int x, int y)

6
planet/Objects.c4d/Items.c4d/Weapons.c4d/Javelin.c4d/Script.c
View File

@ -70,11 +70,7 @@ protected func ControlUseHolding(object pClonk, int ix, int iy)
var iPos = pClonk->GetAnimationPosition(iAim);
iPos += BoundBy(iTargetPosition-iPos, -50, 50);
pClonk->SetAnimationPosition(iAim, Anim_Const(iPos));
if( (pClonk->GetComDir() == COMD_Stop && !pClonk->GetXDir()) || pClonk->GetAction() == "Jump")
{
if(pClonk->GetDir() == 1 && angle < 0) pClonk->SetDir(0);
else if(pClonk->GetDir() == 0 && angle > 0) pClonk->SetDir(1);
}
return 1;
}

5
planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/Script.c
View File

@ -139,11 +139,6 @@ func ControlUseHolding(object pClonk, ix, iy)
var iPos = pClonk->GetAnimationPosition(iAim);
iPos += BoundBy(iTargetPosition-iPos, -50, 50);
pClonk->SetAnimationPosition(iAim, Anim_Const(iPos));
if( (pClonk->GetComDir() == COMD_Stop && !pClonk->GetXDir()) || pClonk->GetAction() == "Jump")
{
if(pClonk->GetDir() == 1 && angle < 0) pClonk->SetDir(0);
else if(pClonk->GetDir() == 0 && angle > 0) pClonk->SetDir(1);
}
}
return true;

14
planet/Objects.c4d/Libraries.c4d/ClonkControl.c4d/Crosshair.c4d/Script.c
View File

@ -84,20 +84,6 @@ private func UpdatePosition()
var x = +Sin(angle,CURSOR_Radius,10);
var y = -Cos(angle,CURSOR_Radius,10);
if((crew->GetComDir() == COMD_Stop && crew->GetXDir() == 0) || crew->GetProcedure() == "FLIGHT")
{
if(crew->GetDir() == DIR_Left)
{
if(x > 0)
crew->SetDir(DIR_Right);
}
else
{
if(x < 0)
crew->SetDir(DIR_Left);
}
}
SetPosition(crew->GetX()+x,crew->GetY()+y);
crew->UpdateVirtualCursorPos();
}

33
planet/Objects.c4d/Libraries.c4d/ClonkControl.c4d/Script.c
View File

@ -673,6 +673,39 @@ private func HoldingUseControl(int ctrl, control, int x, int y, object obj)
}
//Message("%d,%d",this,mex,mey);
// automatic adjustment of the position
// --------------------
// if this is desired for ALL objects is the question, we will find out.
// For now, this is done for items and vehicles, not for buildings and
// mounts (naturally). If turning vehicles just liket hat without issuing
// a turning animation is the question. But after all, the clonk can turn
// by setting the dir too.
// not riding and not in building
if (GetProcedure() != "ATTACH" && !Contained())
{
// pushing vehicle: object to turn is the vehicle
var dir_obj = GetActionTarget();
// otherwise, turn the clonk
if(!dir_obj) dir_obj = this;
if ((dir_obj->GetComDir() == COMD_Stop && dir_obj->GetXDir() == 0) || dir_obj->GetProcedure() == "FLIGHT")
{
if (dir_obj->GetDir() == DIR_Left)
{
if (mex > 0)
dir_obj->SetDir(DIR_Right);
}
else
{
if (mex < 0)
dir_obj->SetDir(DIR_Left);
}
}
}
var handled = obj->Call(Format("~%sUse%sHolding",control,estr),this,mex,mey);