summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2020-04-09 23:52:41 +0200
committerAlexander Harkness <me@bearbin.net>2020-04-10 15:07:16 +0200
commit49f301d5a442f5b452370c48a329fe4cc675abc2 (patch)
treeb17c1e0ba5954701a53c68498479d475313c6e04
parentAdd additional spacing between template/function definitions (diff)
downloadcuberite-49f301d5a442f5b452370c48a329fe4cc675abc2.tar
cuberite-49f301d5a442f5b452370c48a329fe4cc675abc2.tar.gz
cuberite-49f301d5a442f5b452370c48a329fe4cc675abc2.tar.bz2
cuberite-49f301d5a442f5b452370c48a329fe4cc675abc2.tar.lz
cuberite-49f301d5a442f5b452370c48a329fe4cc675abc2.tar.xz
cuberite-49f301d5a442f5b452370c48a329fe4cc675abc2.tar.zst
cuberite-49f301d5a442f5b452370c48a329fe4cc675abc2.zip
-rw-r--r--src/Blocks/Mixins.h21
1 files changed, 19 insertions, 2 deletions
diff --git a/src/Blocks/Mixins.h b/src/Blocks/Mixins.h
index 7c3e16c42..cc1ede5de 100644
--- a/src/Blocks/Mixins.h
+++ b/src/Blocks/Mixins.h
@@ -172,7 +172,15 @@ public:
/** Mixin for blocks whose meta on placement depends on the yaw of the player placing the block. BitMask
selects the direction bits from the block's meta values. */
-template <class Base, NIBBLETYPE BitMask = 0x7, NIBBLETYPE North = 0x2, NIBBLETYPE East = 0x5, NIBBLETYPE South = 0x3, NIBBLETYPE West = 0x4, bool AssertIfNotMatched = false>
+template <
+ class Base,
+ NIBBLETYPE BitMask = 0x7,
+ NIBBLETYPE North = 0x2,
+ NIBBLETYPE East = 0x5,
+ NIBBLETYPE South = 0x3,
+ NIBBLETYPE West = 0x4,
+ bool AssertIfNotMatched = false
+>
class cYawRotator:
public cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>
{
@@ -240,7 +248,16 @@ public:
/** Mixin for blocks whose meta on placement depends on the pitch and yaw of the player placing the block. BitMask
selects the direction bits from the block's meta values. */
-template <class Base, NIBBLETYPE BitMask = 0x7, NIBBLETYPE North = 0x2, NIBBLETYPE East = 0x5, NIBBLETYPE South = 0x3, NIBBLETYPE West = 0x4, NIBBLETYPE Up = 0x1, NIBBLETYPE Down = 0x0>
+template <
+ class Base,
+ NIBBLETYPE BitMask = 0x7,
+ NIBBLETYPE North = 0x2,
+ NIBBLETYPE East = 0x5,
+ NIBBLETYPE South = 0x3,
+ NIBBLETYPE West = 0x4,
+ NIBBLETYPE Up = 0x1,
+ NIBBLETYPE Down = 0x0
+>
class cPitchYawRotator:
public cYawRotator<Base, BitMask, North, East, South, West>
{