diff options
| -rw-r--r-- | source/Defines.h | 24 | ||||
| -rw-r--r-- | source/cTorch.h | 1 |
2 files changed, 13 insertions, 12 deletions
diff --git a/source/Defines.h b/source/Defines.h index 70368373f..6dde8cc8f 100644 --- a/source/Defines.h +++ b/source/Defines.h @@ -23,10 +23,10 @@ enum { BLOCK_FACE_BOTTOM = 0, // Interacting with the bottom face of the block BLOCK_FACE_TOP = 1, // Interacting with the top face of the block - BLOCK_FACE_EAST = 2, // Interacting with the eastern face of the block - BLOCK_FACE_WEST = 3, // Interacting with the western face of the block - BLOCK_FACE_NORTH = 4, // Interacting with the northern face of the block - BLOCK_FACE_SOUTH = 5, // Interacting with the southern face of the block + BLOCK_FACE_NORTH = 2, // Interacting with the northern face of the block + BLOCK_FACE_SOUTH = 3, // Interacting with the southern face of the block + BLOCK_FACE_EAST = 5, // Interacting with the eastern face of the block + BLOCK_FACE_WEST = 4, // Interacting with the western face of the block } ; @@ -114,10 +114,10 @@ inline void AddDirection( int & a_X, int & a_Y, int & a_Z, char a_Direction, boo { case BLOCK_FACE_BOTTOM: a_Y--; break; case BLOCK_FACE_TOP: a_Y++; break; - case BLOCK_FACE_EAST: a_Z--; break; - case BLOCK_FACE_WEST: a_Z++; break; - case BLOCK_FACE_NORTH: a_X--; break; - case BLOCK_FACE_SOUTH: a_X++; break; + case BLOCK_FACE_EAST: a_X++; break; + case BLOCK_FACE_WEST: a_X--; break; + case BLOCK_FACE_NORTH: a_Z--; break; + case BLOCK_FACE_SOUTH: a_Z++; break; default: { ASSERT(!"Unknown direction"); @@ -131,10 +131,10 @@ inline void AddDirection( int & a_X, int & a_Y, int & a_Z, char a_Direction, boo { case BLOCK_FACE_BOTTOM: a_Y++; break; case BLOCK_FACE_TOP: a_Y--; break; - case BLOCK_FACE_EAST: a_Z++; break; - case BLOCK_FACE_WEST: a_Z--; break; - case BLOCK_FACE_NORTH: a_X++; break; - case BLOCK_FACE_SOUTH: a_X--; break; + case BLOCK_FACE_EAST: a_X--; break; + case BLOCK_FACE_WEST: a_X++; break; + case BLOCK_FACE_NORTH: a_Z++; break; + case BLOCK_FACE_SOUTH: a_Z--; break; default: { ASSERT(!"Unknown direction"); diff --git a/source/cTorch.h b/source/cTorch.h index 5d0b9ad0c..fa301c3d4 100644 --- a/source/cTorch.h +++ b/source/cTorch.h @@ -35,6 +35,7 @@ public: { //tolua_export switch (a_MetaData) { + case 0: return BLOCK_FACE_TOP; // by default, the torches stand on the ground case E_META_TORCH_FLOOR: return BLOCK_FACE_TOP; case E_META_TORCH_EAST: return BLOCK_FACE_EAST; case E_META_TORCH_WEST: return BLOCK_FACE_WEST; |