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

rename LineBreak callback to OnLineBreak

liquid_container
Maikel de Vries 2016-03-22 18:58:55 +01:00
parent 19caa65b7b
commit fc008241cd
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/sdk/definition/script.xml
View File

@ -188,8 +188,8 @@
<col>object by</col>
<col>Called before the object is hit or punched by another object. By returning <code>true</code>, QueryCatchBlow can reject physical blows.</col>
</row>
<row id="LineBreak">
<literal_col>LineBreak</literal_col>
<row id="OnLineBreak">
<literal_col>OnLineBreak</literal_col>
<col>int cause</col>
<col>When a line object is broken. cause: 0 by movement, 1 because of a missing or incomplete target object.</col>
</row>

4
planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/CableLine.ocd/Script.c
View File

@ -58,7 +58,7 @@ protected func UpdateDraw2()
var Length = ObjectDistance(GetActionTarget(0), GetActionTarget(1));
if (GetVertexNum() > 2 || Length > max_distance)
{
LineBreak();
OnLineBreak();
return RemoveObject();
}
@ -150,7 +150,7 @@ public func SetConnectedObjects(obj1, obj2)
obj1->AddCableConnection(this);
}
protected func LineBreak(bool no_msg)
protected func OnLineBreak(bool no_msg)
{
Sound("Objects::Connect");
if (!no_msg)

2
planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/PipeLine.ocd/Script.c
View File

@ -57,7 +57,7 @@ public func GetConnectedObject(object obj)
return;
}
private func LineBreak(bool no_msg)
private func OnLineBreak(bool no_msg)
{
Sound("Objects::LineSnap");
if (!no_msg)

2
src/game/C4GameScript.h
View File

@ -72,7 +72,7 @@ bool C4ValueToMatrix(const C4ValueArray& array, StdMeshMatrix* matrix);
#define PSF_QueryCatchBlow "~QueryCatchBlow" // pByObject
#define PSF_Stuck "~Stuck"
#define PSF_GrabLost "~GrabLost"
#define PSF_LineBreak "~LineBreak" // iCause
#define PSF_OnLineBreak "~OnLineBreak" // iCause
#define PSF_BuildNeedsMaterial "~BuildNeedsMaterial" // idMat1, iAmount1, idMat2, iAmount2...
#define PSF_ControlTransfer "~ControlTransfer" // C4Object* pObj, int iTx, int iTy
#define PSF_OnSynchronized "~OnSynchronized"

4
src/object/C4Object.cpp
View File

@ -4005,7 +4005,7 @@ void C4Object::ExecAction()
if (!Action.Target2 || (Action.Target2->Con<FullCon)) fBroke=true;
if (fBroke)
{
Call(PSF_LineBreak,&C4AulParSet(true));
Call(PSF_OnLineBreak,&C4AulParSet(true));
AssignRemoval();
return;
}
@ -4070,7 +4070,7 @@ void C4Object::ExecAction()
// Line fBroke
if (fBroke)
{
Call(PSF_LineBreak,0);
Call(PSF_OnLineBreak,0);
AssignRemoval();
return;
}