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

Merge branch 'master' into GeneratingBenchmark2

Browse Source 
Conflicts:
	src/Blocks/BlockRail.h
	src/World.h
This commit is contained in:
Tycho
2014-01-26 06:28:51 -08:00
parent 14e48ccb4b 09ee8a1bb6
commit bed2ee22e8
279 changed files with 2604 additions and 49505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Blocks/BlockRail.h
+19 -9
View File
@@ -186,25 +186,35 @@ public:
}
if (RailsCnt > 1)
{
if (Neighbors[3] && Neighbors[0]) return E_META_RAIL_CURVED_ZP_XP;
else if (Neighbors[3] && Neighbors[1]) return E_META_RAIL_CURVED_ZP_XM;
else if (Neighbors[2] && Neighbors[0]) return E_META_RAIL_CURVED_ZM_XP;
else if (Neighbors[2] && Neighbors[1]) return E_META_RAIL_CURVED_ZM_XM;
if (Neighbors[3] && Neighbors[0] && CanThisRailCurve()) return E_META_RAIL_CURVED_ZP_XP;
else if (Neighbors[3] && Neighbors[1] && CanThisRailCurve()) return E_META_RAIL_CURVED_ZP_XM;
else if (Neighbors[2] && Neighbors[0] && CanThisRailCurve()) return E_META_RAIL_CURVED_ZM_XP;
else if (Neighbors[2] && Neighbors[1] && CanThisRailCurve()) return E_META_RAIL_CURVED_ZM_XM;
else if (Neighbors[7] && Neighbors[2]) return E_META_RAIL_ASCEND_ZP;
else if (Neighbors[3] && Neighbors[6]) return E_META_RAIL_ASCEND_ZM;
else if (Neighbors[5] && Neighbors[0]) return E_META_RAIL_ASCEND_XM;
else if (Neighbors[4] && Neighbors[1]) return E_META_RAIL_ASCEND_XP;
else if (Neighbors[0] && Neighbors[1]) return E_META_RAIL_XM_XP;
else if (Neighbors[2] && Neighbors[3]) return E_META_RAIL_ZM_ZP;
ASSERT(!"Weird neighbor count");
if (CanThisRailCurve())
{
ASSERT(!"Weird neighbor count");
}
}
return Meta;
}
inline bool CanThisRailCurve(void)
{
return m_BlockType == E_BLOCK_RAIL;
}
bool IsUnstable(cChunkInterface * a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ)
{
if (a_ChunkInterface->GetBlock(a_BlockX, a_BlockY, a_BlockZ) != E_BLOCK_RAIL)
if (!IsBlockRail(a_ChunkInterface->GetBlock(a_BlockX, a_BlockY, a_BlockZ)))
{
return false;
}
@@ -339,11 +349,11 @@ public:
{
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, false);
NIBBLETYPE Meta;
if (a_ChunkInterface->GetBlock(a_BlockX, a_BlockY, a_BlockZ) != E_BLOCK_RAIL)
if (!IsBlockRail(a_ChunkInterface->GetBlock(a_BlockX, a_BlockY, a_BlockZ)))
{
if ((a_ChunkInterface->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ) != E_BLOCK_RAIL) || (a_Pure != E_PURE_UPDOWN))
if (!IsBlockRail(a_ChunkInterface->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ)) || (a_Pure != E_PURE_UPDOWN))
{
if ((a_ChunkInterface->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ) != E_BLOCK_RAIL) || (a_Pure == E_PURE_NONE))
if (!IsBlockRail(a_ChunkInterface->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ)) || (a_Pure == E_PURE_NONE))
{
return true;
}