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

Fixed a typo and some 'code never reached' warnings.

stable-5.1
Peewee 2010-10-10 23:20:42 -04:00
parent 9998ee8795
commit f4d98cdf67
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
planet/Objects.c4d/Items.c4d/Tools.c4d/CableReel.c4d/Script.c
View File

@ -55,7 +55,7 @@ protected func Activate(object pClonk)
pClonk->Message("$TxtConnect$", pObj->GetName());
return true;
}
return true;
// return true;
}
// Finds all power lines connected to pObject (can be nil in local calls).

2
planet/Objects.c4d/Items.c4d/Tools.c4d/JarOfWinds.c4d/Script.c
View File

@ -54,7 +54,7 @@ protected func ControlUse(object pClonk, iX, iY)
pClonk->Message("Reloading!");
return true;
}
ChargeSoundStop();
// ChargeSoundStop();
}
protected func Load()

2
planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/Script.c
View File

@ -104,7 +104,7 @@ func TestMoveOut(xdir, ydir)
public func Unroll(int dir, int unrolldir, int length)
{
if(!unrolldir) unrolldir == COMD_Down;
if(!unrolldir) unrolldir = COMD_Down;
SwitchRopes = 0;
// Unroll dir
if(unrolldir == COMD_Left || unrolldir == COMD_Right)

12
planet/Objects.c4d/Libraries.c4d/LadderClimb.c4d/Script.c
View File

@ -353,12 +353,12 @@ func SetLadderRotation (int r, int xoff, int yoff) {
SetMeshTransformation(Trans_Mul(Trans_Translate(0, -10000), Trans_Rotate(-r,0,0,1), Trans_Translate(xoff, 10000+yoff)), 1);
// SetProperty("MeshTransformation", Trans_Mul(Trans_Translate(0, -10000), Trans_Rotate(-r,0,0,1), Trans_Translate(xoff, 10000+yoff)));
return;
var fsin=Sin(r, 1000), fcos=Cos(r, 1000);
// set matrix values
SetObjDrawTransform (
+fcos, +fsin, xoff, //(1000-fcos)*xoff - fsin*yoff,
-fsin, +fcos, yoff, //(1000-fcos)*yoff + fsin*xoff,
);
// var fsin=Sin(r, 1000), fcos=Cos(r, 1000);
// // set matrix values
// SetObjDrawTransform (
// +fcos, +fsin, xoff, //(1000-fcos)*xoff - fsin*yoff,
// -fsin, +fcos, yoff, //(1000-fcos)*yoff + fsin*xoff,
// );
}
// Defined to prevent an error.

4
planet/Objects.c4d/Libraries.c4d/RopePhysics.c4d/Script.c
View File

@ -425,8 +425,8 @@ public func SetParticleToObject(int index, int obj_index)
particles[index][0][1] = obj->GetY(Rope_Precision);
return;
//Log("Set %d %d", index, obj_index);
particles[index][1][0] = particles[index][0][0];
particles[index][1][1] = particles[index][0][1];
// particles[index][1][0] = particles[index][0][0];
// particles[index][1][1] = particles[index][0][1];
}
public func ConstraintObjects()