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

Merge pull request #2829 from LogicParrot/fences2

Browse Source 
Deleted cPath::BlockTypeIsFence
This commit is contained in:
Julian Laubstein 2015-12-27 15:53:05 +01:00
commit df9825ac09
3 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Defines.h
View File

@ -481,13 +481,20 @@ inline bool IsBlockFence(BLOCKTYPE a_BlockType)
{ {
switch (a_BlockType) switch (a_BlockType)
{ {
case E_BLOCK_FENCE: case E_BLOCK_ACACIA_FENCE:
case E_BLOCK_OAK_FENCE_GATE: case E_BLOCK_ACACIA_FENCE_GATE:
case E_BLOCK_NETHER_BRICK_FENCE: case E_BLOCK_BIRCH_FENCE:
case E_BLOCK_BIRCH_FENCE_GATE:
case E_BLOCK_COBBLESTONE_WALL: case E_BLOCK_COBBLESTONE_WALL:
case E_BLOCK_DARK_OAK_FENCE: case E_BLOCK_DARK_OAK_FENCE:
case E_BLOCK_DARK_OAK_FENCE_GATE:
case E_BLOCK_FENCE:
case E_BLOCK_JUNGLE_FENCE:
case E_BLOCK_JUNGLE_FENCE_GATE:
case E_BLOCK_NETHER_BRICK_FENCE:
case E_BLOCK_OAK_FENCE_GATE:
case E_BLOCK_SPRUCE_FENCE:
case E_BLOCK_SPRUCE_FENCE_GATE: case E_BLOCK_SPRUCE_FENCE_GATE:
case E_BLOCK_ACACIA_FENCE:
{ {
return true; return true;
} }

31
src/Mobs/Path.cpp
View File

@ -508,7 +508,7 @@ void cPath::FillCellAttributes(cPathCell & a_Cell)
a_Cell.m_IsSpecial = true; a_Cell.m_IsSpecial = true;
a_Cell.m_IsSolid = true; // Specials are solids only from a certain direction. But their m_IsSolid is always true a_Cell.m_IsSolid = true; // Specials are solids only from a certain direction. But their m_IsSolid is always true
} }
else if ((a_Cell.m_BlockType == E_BLOCK_AIR) && BlockTypeIsFence(GetCell(Location + Vector3i(0, -1, 0))->m_BlockType)) else if ((a_Cell.m_BlockType == E_BLOCK_AIR) && IsBlockFence(GetCell(Location + Vector3i(0, -1, 0))->m_BlockType))
{ {
// Air blocks with fences below them are consider Special Solids. That is, they sometimes behave as solids. // Air blocks with fences below them are consider Special Solids. That is, they sometimes behave as solids.
a_Cell.m_IsSpecial = true; a_Cell.m_IsSpecial = true;
@ -597,7 +597,7 @@ bool cPath::BodyFitsIn(const Vector3i & a_Location, const Vector3i & a_Source)
bool cPath::BlockTypeIsSpecial(BLOCKTYPE a_Type) bool cPath::BlockTypeIsSpecial(BLOCKTYPE a_Type)
{ {
if (BlockTypeIsFence(a_Type)) if (IsBlockFence(a_Type))
{ {
return true; return true;
} }
@ -619,33 +619,6 @@ bool cPath::BlockTypeIsSpecial(BLOCKTYPE a_Type)
} }
} }
bool cPath::BlockTypeIsFence(BLOCKTYPE a_Type)
{
switch (a_Type)
{
case E_BLOCK_COBBLESTONE_WALL:
case E_BLOCK_FENCE:
case E_BLOCK_OAK_FENCE_GATE:
case E_BLOCK_NETHER_BRICK_FENCE:
case E_BLOCK_SPRUCE_FENCE_GATE:
case E_BLOCK_BIRCH_FENCE_GATE:
case E_BLOCK_JUNGLE_FENCE_GATE:
case E_BLOCK_DARK_OAK_FENCE_GATE:
case E_BLOCK_ACACIA_FENCE_GATE:
case E_BLOCK_SPRUCE_FENCE:
case E_BLOCK_BIRCH_FENCE:
case E_BLOCK_JUNGLE_FENCE:
case E_BLOCK_DARK_OAK_FENCE:
case E_BLOCK_ACACIA_FENCE:
{
return true;
}
default:
{
return false;
}
}
}

1
src/Mobs/Path.h
View File

@ -197,7 +197,6 @@ private:
bool IsWalkable(const Vector3i & a_Location, const Vector3i & a_Source); bool IsWalkable(const Vector3i & a_Location, const Vector3i & a_Source);
bool BodyFitsIn(const Vector3i & a_Location, const Vector3i & a_Source); bool BodyFitsIn(const Vector3i & a_Location, const Vector3i & a_Source);
bool BlockTypeIsSpecial(BLOCKTYPE a_Type); bool BlockTypeIsSpecial(BLOCKTYPE a_Type);
bool BlockTypeIsFence(BLOCKTYPE a_Type); // TODO Perhaps this should be moved to cBlockInfo
bool SpecialIsSolidFromThisDirection(BLOCKTYPE a_Type, NIBBLETYPE a_Meta, const Vector3i & a_Direction); bool SpecialIsSolidFromThisDirection(BLOCKTYPE a_Type, NIBBLETYPE a_Meta, const Vector3i & a_Direction);
bool HasSolidBelow(const Vector3i & a_Location); bool HasSolidBelow(const Vector3i & a_Location);
#ifdef COMPILING_PATHFIND_DEBUGGER #ifdef COMPILING_PATHFIND_DEBUGGER