From 12edc53ab55ae790e9b20b70f440655b527cc93c Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 20 Oct 2012 20:16:55 +0000 Subject: Double chests are formed correctly in all situations (meta is adjusted for the neighboring chest) git-svn-id: http://mc-server.googlecode.com/svn/trunk@991 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Stairs.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'source/Stairs.h') diff --git a/source/Stairs.h b/source/Stairs.h index e17f4abc1..373bf9cd6 100644 --- a/source/Stairs.h +++ b/source/Stairs.h @@ -3,25 +3,35 @@ class cStairs //tolua_export { //tolua_export public: - static char RotationToMetaData( float a_Rotation, int a_Direction ) //tolua_export + static NIBBLETYPE RotationToMetaData( float a_Rotation, char a_BlockFace) //tolua_export { //tolua_export a_Rotation += 90 + 45; // So its not aligned with axis - char result = 0x0; - if( a_Direction == 0) + NIBBLETYPE result = 0x0; + if (a_BlockFace == BLOCK_FACE_BOTTOM) { - result = 0x4; } - if( a_Rotation > 360.f ) a_Rotation -= 360.f; - if( a_Rotation >= 0.f && a_Rotation < 90.f ) + if (a_Rotation > 360.f) + { + a_Rotation -= 360.f; + } + if ((a_Rotation >= 0.f) && (a_Rotation < 90.f)) + { return result; - else if( a_Rotation >= 180 && a_Rotation < 270 ) + } + else if ((a_Rotation >= 180) && (a_Rotation < 270)) + { result += 0x1; - else if( a_Rotation >= 90 && a_Rotation < 180 ) + } + else if ((a_Rotation >= 90) && (a_Rotation < 180)) + { result += 0x2; + } else + { result += 0x3; + } return result; } //tolua_export -- cgit v1.2.3