summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockFenceGate.h
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2020-04-08 22:35:08 +0200
committerAlexander Harkness <me@bearbin.net>2020-04-10 15:07:16 +0200
commitf40aba941eaf69b52ac0fbe3d8cea1ea349b97a6 (patch)
treed96f25621ab462bf3af7ff7403acb54c01a70595 /src/Blocks/BlockFenceGate.h
parentBrewing stands do not have rotation (diff)
downloadcuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.gz
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.bz2
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.lz
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.xz
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.zst
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.zip
Diffstat (limited to 'src/Blocks/BlockFenceGate.h')
-rw-r--r--src/Blocks/BlockFenceGate.h46
1 files changed, 3 insertions, 43 deletions
diff --git a/src/Blocks/BlockFenceGate.h b/src/Blocks/BlockFenceGate.h
index c56925633..5646c51b2 100644
--- a/src/Blocks/BlockFenceGate.h
+++ b/src/Blocks/BlockFenceGate.h
@@ -9,9 +9,9 @@
class cBlockFenceGateHandler :
- public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01, true>>
+ public cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01>>
{
- using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01, true>>;
+ using super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01>>;
public:
@@ -20,22 +20,10 @@ public:
{
}
- virtual bool GetPlacementBlockTypeMeta(
- cChunkInterface & a_ChunkInterface, cPlayer & a_Player,
- int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
- int a_CursorX, int a_CursorY, int a_CursorZ,
- BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
- ) override
- {
- a_BlockType = m_BlockType;
- a_BlockMeta = PlayerYawToMetaData(a_Player.GetYaw());
- return true;
- }
-
virtual bool OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
{
NIBBLETYPE OldMetaData = a_ChunkInterface.GetBlockMeta({a_BlockX, a_BlockY, a_BlockZ});
- NIBBLETYPE NewMetaData = PlayerYawToMetaData(a_Player.GetYaw());
+ NIBBLETYPE NewMetaData = YawToMetaData(a_Player.GetYaw());
OldMetaData ^= 4; // Toggle the gate
if ((OldMetaData & 1) == (NewMetaData & 1))
@@ -62,34 +50,6 @@ public:
return true;
}
- /** Converts the player's yaw to placed gate's blockmeta */
- inline static NIBBLETYPE PlayerYawToMetaData(double a_Yaw)
- {
- ASSERT((a_Yaw >= -180) && (a_Yaw < 180));
-
- a_Yaw += 360 + 45;
- if (a_Yaw > 360)
- {
- a_Yaw -= 360;
- }
- if ((a_Yaw >= 0) && (a_Yaw < 90))
- {
- return 0x0;
- }
- else if ((a_Yaw >= 180) && (a_Yaw < 270))
- {
- return 0x2;
- }
- else if ((a_Yaw >= 90) && (a_Yaw < 180))
- {
- return 0x1;
- }
- else
- {
- return 0x3;
- }
- }
-
virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
{
UNUSED(a_Meta);