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

Rope: Rename CreateRope2() script function to CreateRope()

rope
Armin Burgmeier 2012-05-05 21:45:50 +02:00
parent aaa76be2c4
commit 76dfb050e4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c
View File

@ -30,7 +30,7 @@ func Construction(object creator)
func Initialize()
{
CreateCase();
CreateRope();
CreateCaseRope();
if (partner)
{
@ -53,7 +53,7 @@ func CreateCase()
case->Connect(this);
}
func CreateRope()
func CreateCaseRope()
{
rope = CreateObject(ElevatorRope, -19 * GetCalcDir(), -11, GetOwner());
rope->SetAction("Be", case);
@ -162,4 +162,4 @@ func Definition(def) {
}
local Name = "$Name$";
local Description = "$Description$";
local BlastIncinerate = 100;
local BlastIncinerate = 100;

8
planet/Tests.ocf/Rope.ocs/Script.c
View File

@ -6,8 +6,8 @@ func Initialize()
var b = CreateObject(Rock, 200, 100, NO_OWNER);
//a->SetCategory(C4D_StaticBack);
//b->SetCategory(C4D_StaticBack);
Scenario.rope = CreateRope2(a, b, 20, LiftTower_Rope);
//CreateRope2(a, b, 1, LiftTower_Rope);
Scenario.rope = CreateRope(a, b, 20, LiftTower_Rope);
//CreateRope(a, b, 1, LiftTower_Rope);
}
func InitializePlayer(int plr)
@ -15,7 +15,7 @@ func InitializePlayer(int plr)
var clonk = GetCrew(plr, 0);
var a = CreateObject(Rock, clonk->GetX(), clonk->GetY()-100, NO_OWNER);
a->SetCategory(C4D_StaticBack);
var rope = CreateRope2(a, clonk, 20, LiftTower_Rope);
var rope = CreateRope(a, clonk, 20, LiftTower_Rope);
rope->SetFrontAutoSegmentation(300);
rope->SetFrontAutoSegmentation(200);
}

2
src/object/C4ObjectScript.cpp
View File

@ -2479,7 +2479,7 @@ void InitObjectFunctionMap(C4AulScriptEngine *pEngine)
AddFunc(pEngine, "SetAttachTransform", FnSetAttachTransform);
AddFunc(pEngine, "GetMeshMaterial", FnGetMeshMaterial);
AddFunc(pEngine, "SetMeshMaterial", FnSetMeshMaterial);
AddFunc(pEngine, "CreateRope2", FnCreateRope);
AddFunc(pEngine, "CreateRope", FnCreateRope);
AddFunc(pEngine, "ChangeDef", FnChangeDef);
AddFunc(pEngine, "GrabContents", FnGrabContents);
AddFunc(pEngine, "Punch", FnPunch);