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

Grappler: fixed division by zero (#613)

Tobias Zwick 2011-09-19 14:03:43 +02:00
parent bcbb2ae132
commit 55fa80fac1
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Rope.ocd/Script.c
View File

@ -190,22 +190,23 @@ func UpdateLines()
} }
var diff = Vec_Sub(end,start); var diff = Vec_Sub(end,start);
var point = Vec_Add(start, Vec_Div(diff, 2)); var point = Vec_Add(start, Vec_Div(diff, 2));
var diffangle = Vec_Angle(diff, [0,0]); var diffangle = Vec_Angle(diff, [0,0]);
var length = Vec_Length(diff)*1000/Rope_Precision/10; var length = Vec_Length(diff)*1000/Rope_Precision/10;
if(i == ParticleCount-1) if(i == ParticleCount-1)
{ {
var old = particles[i-2][0][:]; var old = particles[i-2][0][:];
var old_diff = Vec_Sub(start,old); var old_diff = Vec_Sub(start,old);
var o_length = Vec_Length(old_diff)*1000/Rope_Precision/10; var o_length = Vec_Length(old_diff)*1000/Rope_Precision/10;
diff = Vec_Div(Vec_Mul(old_diff, length),o_length); if(!o_length) diff = old_diff;
// objects[1][0]->Message("%d", Vec_Length(diff)*1000/Rope_Precision/10); else diff = Vec_Div(Vec_Mul(old_diff, length),o_length);
diffangle = Vec_Angle(diff, [0,0]); // objects[1][0]->Message("%d", Vec_Length(diff)*1000/Rope_Precision/10);
point = Vec_Add(start, Vec_Div(diff, 2)); diffangle = Vec_Angle(diff, [0,0]);
//length = o_length; point = Vec_Add(start, Vec_Div(diff, 2));
last_point = point; //length = o_length;
} last_point = point;
}
if(i == 1) if(i == 1)
{ {
@ -233,12 +234,12 @@ local ClonkOldSpeed;
func GetClonkPos() func GetClonkPos()
{ {
return particles[-1][0]; return particles[-1][0];
} }
func GetClonkOff() func GetClonkOff()
{ {
return Vec_Sub(particles[-1][0],last_point); return Vec_Sub(particles[-1][0],last_point);
var clonk = objects[1][0]; var clonk = objects[1][0];
var speed = [clonk->GetXDir(Rope_Precision), clonk->GetYDir(Rope_Precision)]; var speed = [clonk->GetXDir(Rope_Precision), clonk->GetYDir(Rope_Precision)];
var offset = speed; var offset = speed;