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

Fix torches broken in rev 724

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@737 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-08-14 15:53:05 +00:00
parent 004401a70a
commit d58db08c1b
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/Defines.h
View File

@ -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");

1
source/cTorch.h
View File

@ -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;