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

Begin implementing ascending rails

Browse Source
This commit is contained in:
Tiger Wang 2014-01-19 19:31:17 +00:00
parent 3700ad8546
commit 83cbe8c139
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Entities/Minecart.cpp
View File

@ -360,6 +360,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
{ {
SetYaw(315); // Set correct rotation server side SetYaw(315); // Set correct rotation server side
SetPosY(floor(GetPosY()) + 0.55); // Levitate dat cart SetPosY(floor(GetPosY()) + 0.55); // Levitate dat cart
SetSpeedY(0);
TestBlockCollision(a_RailMeta); TestBlockCollision(a_RailMeta);
TestEntityCollision(a_RailMeta); TestEntityCollision(a_RailMeta);
@ -372,6 +373,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
{ {
SetYaw(225); SetYaw(225);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(0);
TestBlockCollision(a_RailMeta); TestBlockCollision(a_RailMeta);
TestEntityCollision(a_RailMeta); TestEntityCollision(a_RailMeta);
@ -382,6 +384,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
{ {
SetYaw(135); SetYaw(135);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(0);
TestBlockCollision(a_RailMeta); TestBlockCollision(a_RailMeta);
TestEntityCollision(a_RailMeta); TestEntityCollision(a_RailMeta);
@ -392,6 +395,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
{ {
SetYaw(45); SetYaw(45);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(0);
TestBlockCollision(a_RailMeta); TestBlockCollision(a_RailMeta);
TestEntityCollision(a_RailMeta); TestEntityCollision(a_RailMeta);
@ -431,7 +435,8 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
SetSpeedY(0); SetSpeedY(0);
SetSpeedX(0); SetSpeedX(0);
if (TestBlockCollision(a_RailMeta)) return; bool BlckCol = TestBlockCollision(a_RailMeta), EntCol = TestEntityCollision(a_RailMeta);
if (EntCol || BlckCol) return;
if (GetSpeedZ() != 0) if (GetSpeedZ() != 0)
{ {
@ -453,7 +458,8 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
SetSpeedY(0); SetSpeedY(0);
SetSpeedZ(0); SetSpeedZ(0);
if (TestBlockCollision(a_RailMeta)) return; bool BlckCol = TestBlockCollision(a_RailMeta), EntCol = TestEntityCollision(a_RailMeta);
if (EntCol || BlckCol) return;
if (GetSpeedX() != 0) if (GetSpeedX() != 0)
{ {
@ -468,6 +474,27 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
} }
break; break;
} }
case E_META_RAIL_ASCEND_XM:
{
SetYaw(180);
SetSpeedZ(0);
if (GetSpeedX() >= 0)
{
if (GetSpeedX() <= MAX_SPEED)
{
AddSpeedX(1);
SetSpeedY(-GetSpeedX());
}
}
else
{
AddSpeedX(-1);
SetSpeedY(-GetSpeedX());
}
break;
}
default: ASSERT(!"Unhandled powered rail metadata!"); break;
} }
} }
@ -479,6 +506,15 @@ void cMinecart::HandleDetectorRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
{ {
m_World->SetBlockMeta(m_DetectorRailPosition, a_RailMeta | 0x08); m_World->SetBlockMeta(m_DetectorRailPosition, a_RailMeta | 0x08);
// No special handling
HandleRailPhysics(a_RailMeta & 0x07, a_Dt);
}
void cMinecart::HandleActivatorRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
{
HandleRailPhysics(a_RailMeta & 0x07, a_Dt); HandleRailPhysics(a_RailMeta & 0x07, a_Dt);
} }
@ -529,6 +565,7 @@ void cMinecart::SnapToRail(NIBBLETYPE a_RailMeta)
SetSpeedX(0); SetSpeedX(0);
SetPosX(floor(GetPosX()) + 0.5); SetPosX(floor(GetPosX()) + 0.5);
} }
SetSpeedY(0);
break; break;
} }
case E_META_RAIL_CURVED_ZM_XP: case E_META_RAIL_CURVED_ZM_XP:
@ -553,6 +590,7 @@ void cMinecart::SnapToRail(NIBBLETYPE a_RailMeta)
SetSpeedX(0); SetSpeedX(0);
SetPosX(floor(GetPosX()) + 0.5); SetPosX(floor(GetPosX()) + 0.5);
} }
SetSpeedY(0);
break; break;
} }
case E_META_RAIL_CURVED_ZP_XM: case E_META_RAIL_CURVED_ZP_XM:
@ -577,6 +615,7 @@ void cMinecart::SnapToRail(NIBBLETYPE a_RailMeta)
SetSpeedX(0); SetSpeedX(0);
SetPosX(floor(GetPosX()) + 0.5); SetPosX(floor(GetPosX()) + 0.5);
} }
SetSpeedY(0);
break; break;
} }
case E_META_RAIL_CURVED_ZP_XP: case E_META_RAIL_CURVED_ZP_XP:
@ -601,6 +640,7 @@ void cMinecart::SnapToRail(NIBBLETYPE a_RailMeta)
SetSpeedX(0); SetSpeedX(0);
SetPosX(floor(GetPosX()) + 0.5); SetPosX(floor(GetPosX()) + 0.5);
} }
SetSpeedY(0);
break; break;
} }
default: break; default: break;

3
src/Entities/Minecart.h
View File

@ -65,6 +65,9 @@ protected:
*/ */
void HandleDetectorRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt); void HandleDetectorRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt);
/** Handles activator rails - placeholder for future implementation */
void HandleActivatorRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt);
/** Snaps a mincecart to a rail's axis, resetting its speed /** Snaps a mincecart to a rail's axis, resetting its speed
For curved rails, it changes the cart's direction as well as snapping it to axis */ For curved rails, it changes the cart's direction as well as snapping it to axis */
void SnapToRail(NIBBLETYPE a_RailMeta); void SnapToRail(NIBBLETYPE a_RailMeta);