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

Further fixing of coding style errors

Browse Source
This commit is contained in:
Christophe Piveteau 2014-08-13 19:47:43 +02:00
parent 3f117897fb
commit 2d2d4ff33b
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Entities/Minecart.cpp
View File

@ -879,14 +879,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
);
if ( Distance.z == 0. )
if (Distance.z == 0.)
{
Distance.z = 0.0001;
}
if ( ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((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)))
{
if ( (-GetSpeedX() * 0.4) < 0.01 )
if ((-GetSpeedX() * 0.4) < 0.01)
{
AddSpeedX( -4/sqrt(2) );
AddSpeedZ( 4/sqrt(2) );
@ -897,18 +898,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
SetSpeedZ( GetSpeedZ() * 0.4 );
}
}
else if ((GetSpeedX() * 0.4) < 0.01)
{
AddSpeedX( 4/sqrt(2) );
AddSpeedZ( -4/sqrt(2) );
}
else
{
if ((GetSpeedX() * 0.4) < 0.01)
{
AddSpeedX( 4/sqrt(2) );
AddSpeedZ( -4/sqrt(2) );
}
else
{
SetSpeedX( GetSpeedX() * 0.4 );
SetSpeedZ( -GetSpeedZ() * 0.4 );
}
SetSpeedX( GetSpeedX() * 0.4 );
SetSpeedZ( -GetSpeedZ() * 0.4 );
}
break;
}
@ -921,14 +919,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
);
if ( Distance.z == 0. )
if (Distance.z == 0.)
{
Distance.z = 0.0001;
}
if ( ((Distance.z>=0)&&((Distance.x/Distance.z)<=-1)) || ((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)))
{
if ( (GetSpeedX() * 0.4) < 0.01 )
if ((GetSpeedX() * 0.4) < 0.01)
{
AddSpeedX( 4/sqrt(2) );
AddSpeedZ( 4/sqrt(2) );
@ -939,18 +938,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
SetSpeedZ( GetSpeedZ() * 0.4 );
}
}
else if ((-GetSpeedX() * 0.4) < 0.01)
{
AddSpeedX( -4/sqrt(2) );
AddSpeedZ( -4/sqrt(2) );
}
else
{
if ((-GetSpeedX() * 0.4) < 0.01)
{
AddSpeedX( -4/sqrt(2) );
AddSpeedZ( -4/sqrt(2) );
}
else
{
SetSpeedX( -GetSpeedX() * 0.4 );
SetSpeedZ( -GetSpeedZ() * 0.4 );
}
SetSpeedX( -GetSpeedX() * 0.4 );
SetSpeedZ( -GetSpeedZ() * 0.4 );
}
break;
}