flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Further changes in coding style

Browse Source
This commit is contained in:
Christophe Piveteau 2014-08-14 14:29:46 +02:00
parent 2d2d4ff33b
commit e3a74f379f
1 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/Entities/Minecart.cpp
View File

@ -873,80 +873,70 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
case E_META_RAIL_CURVED_ZM_XM: case E_META_RAIL_CURVED_ZM_XM:
case E_META_RAIL_CURVED_ZP_XP: case E_META_RAIL_CURVED_ZP_XP:
{ {
Vector3d Distance( Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
0,
MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
);
if (Distance.z == 0.) Distance.z = std::max(Distance.z, 0.001);
{
Distance.z = 0.0001;
}
if (((Distance.z >= 0) && ((Distance.x / Distance.z) >= 1)) || if (
((Distance.z<0) && ((Distance.x / Distance.z) <= 1))) ((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
)
{ {
if ((-GetSpeedX() * 0.4) < 0.01) if ((-GetSpeedX() * 0.4) < 0.01)
{ {
AddSpeedX( -4/sqrt(2) ); AddSpeedX(-4/sqrt(2));
AddSpeedZ( 4/sqrt(2) ); AddSpeedZ(4/sqrt(2));
} }
else else
{ {
SetSpeedX( -GetSpeedX() * 0.4 ); SetSpeedX(-GetSpeedX() * 0.4);
SetSpeedZ( GetSpeedZ() * 0.4 ); SetSpeedZ(GetSpeedZ() * 0.4);
} }
} }
else if ((GetSpeedX() * 0.4) < 0.01) else if ((GetSpeedX() * 0.4) < 0.01)
{ {
AddSpeedX( 4/sqrt(2) ); AddSpeedX(4/sqrt(2));
AddSpeedZ( -4/sqrt(2) ); AddSpeedZ(-4/sqrt(2));
} }
else else
{ {
SetSpeedX( GetSpeedX() * 0.4 ); SetSpeedX(GetSpeedX() * 0.4);
SetSpeedZ( -GetSpeedZ() * 0.4 ); SetSpeedZ(-GetSpeedZ() * 0.4);
} }
break; break;
} }
case E_META_RAIL_CURVED_ZM_XP: case E_META_RAIL_CURVED_ZM_XP:
case E_META_RAIL_CURVED_ZP_XM: case E_META_RAIL_CURVED_ZP_XM:
{ {
Vector3d Distance( Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
0,
MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
);
if (Distance.z == 0.) Distance.z = std::max(Distance.z, 0.001);
{
Distance.z = 0.0001;
}
if (((Distance.z >= 0) && ((Distance.x / Distance.z) <= -1)) || if (
((Distance.z<0) && ((Distance.x / Distance.z) >= -1))) ((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
)
{ {
if ((GetSpeedX() * 0.4) < 0.01) if ((GetSpeedX() * 0.4) < 0.01)
{ {
AddSpeedX( 4/sqrt(2) ); AddSpeedX(4/sqrt(2));
AddSpeedZ( 4/sqrt(2) ); AddSpeedZ(4/sqrt(2));
} }
else else
{ {
SetSpeedX( GetSpeedX() * 0.4 ); SetSpeedX(GetSpeedX() * 0.4);
SetSpeedZ( GetSpeedZ() * 0.4 ); SetSpeedZ(GetSpeedZ() * 0.4);
} }
} }
else if ((-GetSpeedX() * 0.4) < 0.01) else if ((-GetSpeedX() * 0.4) < 0.01)
{ {
AddSpeedX( -4/sqrt(2) ); AddSpeedX(-4/sqrt(2));
AddSpeedZ( -4/sqrt(2) ); AddSpeedZ(-4/sqrt(2));
} }
else else
{ {
SetSpeedX( -GetSpeedX() * 0.4 ); SetSpeedX(-GetSpeedX() * 0.4);
SetSpeedZ( -GetSpeedZ() * 0.4 ); SetSpeedZ(-GetSpeedZ() * 0.4);
} }
break; break;
} }