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

fixed bug with two grapplers. Shooting the second in the air while hanging on the first doesn't disconnect the rope now

Richard Gerum 2010-12-04 20:38:59 +01:00
parent 959c0d4322
commit 4651341c5f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Rope.c4d/Script.c
View File

@ -91,7 +91,7 @@ public func MaxLengthReached()
{
for(var i = 0; i < ParticleCount; i++)
particles[i][1] = particles[i][0][:];
DrawIn();
DrawIn(1);
}
}
@ -121,7 +121,7 @@ func FxDrawInTimer()
}
}
func DrawIn()
func DrawIn(fNoControl)
{
DrawingIn = 1;
if(!GetEffect("DrawIn", this))
@ -133,7 +133,7 @@ func DrawIn()
ConnectPull();
var clonk = objects[1][0];
if(clonk->Contained()) clonk = clonk->Contained();
RemoveEffect("IntGrappleControl", clonk);
if(!fNoControl) RemoveEffect("IntGrappleControl", clonk);
}
}

3
planet/Tests.c4f/GrappleRace.c4s/Scenario.txt
View File

@ -2,6 +2,9 @@
Icon=37
Title=GrappleRace
[Definitions]
Definition1=Objects.c4d
[Game]
Goals=Goal_Parkour