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

fixed the shield always force-turning the Clonk

David Dormagen 2012-11-05 21:30:34 +01:00
parent 4dfa3f9309
commit fcba3e9a0e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/Script.c
View File

@ -108,14 +108,9 @@ private func UpdateShieldAngle(object clonk, int x, int y)
{
var angle=Normalize(Angle(0,0, x,y),-180);
angle=BoundBy(angle,-150,150);
if(angle > 0) clonk->SetTurnForced(DIR_Right);
else clonk->SetTurnForced(DIR_Left);
iAngle=angle;
var weight = 0;
if( Abs(iAngle) > 90) weight = 1000*( Abs(iAngle)-60 )/90;
if( Abs(angle) > 90) weight = 1000*( Abs(angle)-60 )/90;
var handLR;
if(clonk->GetHandPosByItemPos(clonk->GetItemPos(this)) == 0)
@ -129,7 +124,10 @@ private func UpdateShieldAngle(object clonk, int x, int y)
if(!GetEffect("IntShieldSuspend", clonk))
{
clonk->SetAnimationPosition(aim_anim, Anim_Const(Abs(iAngle) * 11111/1000));
if(angle > 0) clonk->SetTurnForced(DIR_Right);
else clonk->SetTurnForced(DIR_Left);
clonk->SetAnimationPosition(aim_anim, Anim_Const(Abs(angle) * 11111/1000));
AdjustSolidMaskHelper();
}
}