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

Merge pull request #3037 from marvinkopf/minecart

Browse Source 
Add speed limit enforcement for minecarts
This commit is contained in:
LogicParrot 2016-04-15 06:38:26 +03:00
commit 25b6bac865
2 changed files with 54 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/Entities/Minecart.cpp
View File

@ -277,11 +277,8 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
if (GetSpeedZ() >= 0) if (GetSpeedZ() >= 0)
{ {
// SpeedZ POSITIVE, going SOUTH // SpeedZ POSITIVE, going SOUTH
if (GetSpeedZ() <= MAX_SPEED) // Speed limit AddSpeedZ(0.5); // Speed up
{ SetSpeedY(-GetSpeedZ()); // Downward movement is negative (0 minus positive numbers is negative)
AddSpeedZ(0.5); // Speed up
SetSpeedY(-GetSpeedZ()); // Downward movement is negative (0 minus positive numbers is negative)
}
} }
else else
{ {
@ -304,12 +301,9 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
else else
{ {
if (GetSpeedZ() >= MAX_SPEED_NEGATIVE) // Speed limit // SpeedZ NEGATIVE, going NORTH
{ AddSpeedZ(-0.5); // Speed up
// SpeedZ NEGATIVE, going NORTH SetSpeedY(GetSpeedZ()); // Downward movement negative
AddSpeedZ(-0.5); // Speed up
SetSpeedY(GetSpeedZ()); // Downward movement negative
}
} }
break; break;
} }
@ -320,11 +314,8 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
if (GetSpeedX() >= NO_SPEED) if (GetSpeedX() >= NO_SPEED)
{ {
if (GetSpeedX() <= MAX_SPEED) AddSpeedX(0.5);
{ SetSpeedY(-GetSpeedX());
AddSpeedX(0.5);
SetSpeedY(-GetSpeedX());
}
} }
else else
{ {
@ -345,11 +336,8 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
else else
{ {
if (GetSpeedX() >= MAX_SPEED_NEGATIVE) AddSpeedX(-0.5);
{ SetSpeedY(GetSpeedX());
AddSpeedX(-0.5);
SetSpeedY(GetSpeedX());
}
} }
break; break;
} }
@ -484,11 +472,8 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
if (GetSpeedX() >= NO_SPEED) if (GetSpeedX() >= NO_SPEED)
{ {
if (GetSpeedX() <= MAX_SPEED) AddSpeedX(AccelDecelSpeed);
{ SetSpeedY(-GetSpeedX());
AddSpeedX(AccelDecelSpeed);
SetSpeedY(-GetSpeedX());
}
} }
else else
{ {
@ -509,11 +494,8 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
} }
else else
{ {
if (GetSpeedX() >= MAX_SPEED_NEGATIVE) AddSpeedX(AccelDecelNegSpeed);
{ SetSpeedY(GetSpeedX());
AddSpeedX(AccelDecelNegSpeed);
SetSpeedY(GetSpeedX());
}
} }
break; break;
} }
@ -524,11 +506,8 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
if (GetSpeedZ() >= NO_SPEED) if (GetSpeedZ() >= NO_SPEED)
{ {
if (GetSpeedZ() <= MAX_SPEED) AddSpeedZ(AccelDecelSpeed);
{ SetSpeedY(-GetSpeedZ());
AddSpeedZ(AccelDecelSpeed);
SetSpeedY(-GetSpeedZ());
}
} }
else else
{ {
@ -549,11 +528,8 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
} }
else else
{ {
if (GetSpeedZ() >= MAX_SPEED_NEGATIVE) AddSpeedZ(AccelDecelNegSpeed);
{ SetSpeedY(GetSpeedZ());
AddSpeedZ(AccelDecelNegSpeed);
SetSpeedY(GetSpeedZ());
}
} }
break; break;
} }
@ -1043,6 +1019,40 @@ bool cMinecart::DoTakeDamage(TakeDamageInfo & TDI)
void cMinecart::DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
{
if (a_SpeedX > MAX_SPEED)
{
a_SpeedX = MAX_SPEED;
}
else if (a_SpeedX < MAX_SPEED_NEGATIVE)
{
a_SpeedX = MAX_SPEED_NEGATIVE;
}
if (a_SpeedY > MAX_SPEED)
{
a_SpeedY = MAX_SPEED;
}
else if (a_SpeedY < MAX_SPEED_NEGATIVE)
{
a_SpeedY = MAX_SPEED_NEGATIVE;
}
if (a_SpeedZ > MAX_SPEED)
{
a_SpeedZ = MAX_SPEED;
}
else if (a_SpeedZ < MAX_SPEED_NEGATIVE)
{
a_SpeedZ = MAX_SPEED_NEGATIVE;
}
super::DoSetSpeed(a_SpeedX, a_SpeedY, a_SpeedZ);
}
void cMinecart::Destroyed() void cMinecart::Destroyed()
{ {
if (m_bIsOnDetectorRail) if (m_bIsOnDetectorRail)

3
src/Entities/Minecart.h
View File

@ -51,6 +51,9 @@ protected:
Vector3i m_DetectorRailPosition; Vector3i m_DetectorRailPosition;
bool m_bIsOnDetectorRail; bool m_bIsOnDetectorRail;
// Overwrite to enforce speed limit
virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ);
cMinecart(ePayload a_Payload, double a_X, double a_Y, double a_Z); cMinecart(ePayload a_Payload, double a_X, double a_Y, double a_Z);
/** Handles physics on normal rails /** Handles physics on normal rails