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

Fixed MSVC2008 compilation.

Browse Source 
It was getting confused about which sqrt() overload to call.
This commit is contained in:
madmaxoft 2014-08-30 22:11:09 +02:00
parent a4778b6e33
commit b0a7d93ae1
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Entities/Minecart.cpp
View File

@ -891,31 +891,31 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
) )
{ {
// Moving -X +Z // Moving -X +Z
if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01) if ((-GetSpeedX() * 0.4 / sqrt(2.0)) < 0.01)
{ {
// ~ SpeedX >= 0 Immobile or not moving in the "right" direction. Give it a bump! // ~ SpeedX >= 0 Immobile or not moving in the "right" direction. Give it a bump!
AddSpeedX(-4 / sqrt(2)); AddSpeedX(-4 / sqrt(2.0));
AddSpeedZ(4 / sqrt(2)); AddSpeedZ(4 / sqrt(2.0));
} }
else else
{ {
// ~ SpeedX < 0 Moving in the "right" direction. Only accelerate it a bit. // ~ SpeedX < 0 Moving in the "right" direction. Only accelerate it a bit.
SetSpeedX(GetSpeedX() * 0.4 / sqrt(2)); SetSpeedX(GetSpeedX() * 0.4 / sqrt(2.0));
SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2)); SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2.0));
} }
} }
else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01) else if ((GetSpeedX() * 0.4 / sqrt(2.0)) < 0.01)
{ {
// Moving +X -Z // Moving +X -Z
// ~ SpeedX <= 0 Immobile or not moving in the "right" direction // ~ SpeedX <= 0 Immobile or not moving in the "right" direction
AddSpeedX(4 / sqrt(2)); AddSpeedX(4 / sqrt(2.0));
AddSpeedZ(-4 / sqrt(2)); AddSpeedZ(-4 / sqrt(2.0));
} }
else else
{ {
// ~ SpeedX > 0 Moving in the "right" direction // ~ SpeedX > 0 Moving in the "right" direction
SetSpeedX(GetSpeedX() * 0.4 / sqrt(2)); SetSpeedX(GetSpeedX() * 0.4 / sqrt(2.0));
SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2)); SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2.0));
} }
break; break;
} }
@ -943,28 +943,28 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
if ((GetSpeedX() * 0.4) < 0.01) if ((GetSpeedX() * 0.4) < 0.01)
{ {
// ~ SpeedX <= 0 Immobile or not moving in the "right" direction // ~ SpeedX <= 0 Immobile or not moving in the "right" direction
AddSpeedX(4 / sqrt(2)); AddSpeedX(4 / sqrt(2.0));
AddSpeedZ(4 / sqrt(2)); AddSpeedZ(4 / sqrt(2.0));
} }
else else
{ {
// ~ SpeedX > 0 Moving in the "right" direction // ~ SpeedX > 0 Moving in the "right" direction
SetSpeedX(GetSpeedX() * 0.4 / sqrt(2)); SetSpeedX(GetSpeedX() * 0.4 / sqrt(2.0));
SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2)); SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2.0));
} }
} }
else if ((-GetSpeedX() * 0.4) < 0.01) else if ((-GetSpeedX() * 0.4) < 0.01)
{ {
// Moving -X -Z // Moving -X -Z
// ~ SpeedX >= 0 Immobile or not moving in the "right" direction // ~ SpeedX >= 0 Immobile or not moving in the "right" direction
AddSpeedX(-4 / sqrt(2)); AddSpeedX(-4 / sqrt(2.0));
AddSpeedZ(-4 / sqrt(2)); AddSpeedZ(-4 / sqrt(2.0));
} }
else else
{ {
// ~ SpeedX < 0 Moving in the "right" direction // ~ SpeedX < 0 Moving in the "right" direction
SetSpeedX(GetSpeedX() * 0.4 / sqrt(2)); SetSpeedX(GetSpeedX() * 0.4 / sqrt(2.0));
SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2)); SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2.0));
} }
break; break;
} }