summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockTorch.h
diff options
context:
space:
mode:
authorandrew <xdotftw@gmail.com>2014-03-01 20:34:19 +0100
committerandrew <xdotftw@gmail.com>2014-03-01 20:34:19 +0100
commitd73cdba1f66a92f011ac881b581595c0959139ef (patch)
treea5c62bbc0cf7c52727e96e348a5978698c6c7a5d /src/Blocks/BlockTorch.h
parentRefactored global block property arrays (diff)
downloadcuberite-d73cdba1f66a92f011ac881b581595c0959139ef.tar
cuberite-d73cdba1f66a92f011ac881b581595c0959139ef.tar.gz
cuberite-d73cdba1f66a92f011ac881b581595c0959139ef.tar.bz2
cuberite-d73cdba1f66a92f011ac881b581595c0959139ef.tar.lz
cuberite-d73cdba1f66a92f011ac881b581595c0959139ef.tar.xz
cuberite-d73cdba1f66a92f011ac881b581595c0959139ef.tar.zst
cuberite-d73cdba1f66a92f011ac881b581595c0959139ef.zip
Diffstat (limited to 'src/Blocks/BlockTorch.h')
-rw-r--r--src/Blocks/BlockTorch.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h
index f2a4c8665..84bbb37ec 100644
--- a/src/Blocks/BlockTorch.h
+++ b/src/Blocks/BlockTorch.h
@@ -99,7 +99,7 @@ public:
static bool CanBePlacedOn(BLOCKTYPE a_BlockType, eBlockFace a_BlockFace)
{
- if ( !g_BlockFullyOccupiesVoxel[a_BlockType] )
+ if ( !cBlockInfo::FullyOccupiesVoxel(a_BlockType) )
{
return (a_BlockFace == BLOCK_FACE_TOP); // Allow placement only when torch upright (for glass, etc.); exceptions won't even be sent by client, no need to handle
}
@@ -129,7 +129,7 @@ public:
{
return Face;
}
- else if ((g_BlockFullyOccupiesVoxel[BlockInQuestion]) && (i != BLOCK_FACE_BOTTOM))
+ else if (cBlockInfo::FullyOccupiesVoxel(BlockInQuestion) && (i != BLOCK_FACE_BOTTOM))
{
// Otherwise, if block in that direction is torch placeable and we haven't gotten to it via the bottom face, return that face
return Face;
@@ -163,7 +163,7 @@ public:
// No need to check for upright orientation, it was done when the torch was placed
return true;
}
- else if ( !g_BlockFullyOccupiesVoxel[BlockInQuestion] )
+ else if ( !cBlockInfo::FullyOccupiesVoxel(BlockInQuestion) )
{
return false;
}