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

remove unused LineMaxDistance property

liquid_container
Maikel de Vries 2016-03-22 22:26:46 +01:00
parent 9d026da0a2
commit d6b963d321
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sdk/definition/procedures.xml
View File

@ -101,7 +101,7 @@
<row id="CONNECT">
<col>DFA_CONNECT</col>
<col>Line connections</col>
<col>Only <emlink href="definition/lineconnect.html">line objects</emlink>. Connects <emlink href="script/fn/SetAction.html">target object 1</emlink> and <emlink href="script/fn/SetAction.html">target object 2</emlink>. If property LineMaxDistance is a nonzero integer, the line breaks when the target objects are further apart than the given distance.</col>
<col>Only <emlink href="definition/lineconnect.html">line objects</emlink>. Connects <emlink href="script/fn/SetAction.html">target object 1</emlink> and <emlink href="script/fn/SetAction.html">target object 2</emlink>.</col>
<col>CNAT_None</col>
</row>
<row id="PULL">

12
src/object/C4Object.cpp
View File

@ -4062,18 +4062,6 @@ void C4Object::ExecAction()
fLineChange = true;
}
// Check max length
int32_t max_dist;
max_dist = GetPropertyInt(P_LineMaxDistance);
if (max_dist)
{
int32_t dist_x = iConnectX2 - iConnectX1, dist_y = iConnectY2 - iConnectY1;
int64_t dist_x2 = int64_t(dist_x)*dist_x;
int64_t dist_y2 = int64_t(dist_y)*dist_y;
int64_t max_dist2 = int64_t(max_dist)*max_dist;
if (dist_x2+dist_y2 > max_dist2) fBroke = true;
}
// Line fBroke
if (fBroke)
{

1
src/script/C4StringTable.cpp
View File

@ -131,7 +131,6 @@ C4StringTable::C4StringTable()
P[P_Parallaxity] = "Parallaxity";
P[P_LineColors] = "LineColors";
P[P_LineAttach] = "LineAttach";
P[P_LineMaxDistance] = "LineMaxDistance";
P[P_MouseDrag] = "MouseDrag";
P[P_MouseDragImage] = "MouseDragImage";
P[P_PictureTransformation] = "PictureTransformation";

1
src/script/C4StringTable.h
View File

@ -302,7 +302,6 @@ enum C4PropertyName
P_Parallaxity,
P_LineColors,
P_LineAttach,
P_LineMaxDistance, // unused?
P_PictureTransformation,
P_MeshTransformation,
P_Procedure,