From 0d722701861ad9acfa7d36c5156fd184e3ba6bee Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Fri, 10 Apr 2020 12:25:36 +0100
Subject: Replace all single-digit hex constants with two-digit version

---
 src/Blocks/BlockBed.h       |  4 ++--
 src/Blocks/BlockHandler.cpp |  2 +-
 src/Blocks/Mixins.h         | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Blocks/BlockBed.h b/src/Blocks/BlockBed.h
index 3d35b2bf5..ecf1f0d88 100644
--- a/src/Blocks/BlockBed.h
+++ b/src/Blocks/BlockBed.h
@@ -16,9 +16,9 @@ class cWorldInterface;
 
 
 class cBlockBedHandler :
-	public cYawRotator<cBlockEntityHandler, 0x3, 0x02, 0x03, 0x00, 0x01>
+	public cYawRotator<cBlockEntityHandler, 0x03, 0x02, 0x03, 0x00, 0x01>
 {
-	using super = cYawRotator<cBlockEntityHandler, 0x3, 0x02, 0x03, 0x00, 0x01>;
+	using super = cYawRotator<cBlockEntityHandler, 0x03, 0x02, 0x03, 0x00, 0x01>;
 
 public:
 
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index f82118ec2..fd7ca2f52 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -97,7 +97,7 @@
 
 
 
-using cBlockGlazedTerracottaHandler = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x3, 0x1, 0x3, 0x0, 0x2>>;
+using cBlockGlazedTerracottaHandler = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x01, 0x03, 0x00, 0x02>>;
 
 
 
diff --git a/src/Blocks/Mixins.h b/src/Blocks/Mixins.h
index cc1ede5de..24fad22be 100644
--- a/src/Blocks/Mixins.h
+++ b/src/Blocks/Mixins.h
@@ -174,11 +174,11 @@ public:
 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 BitMask = 0x07,
+	NIBBLETYPE North = 0x02,
+	NIBBLETYPE East = 0x05,
+	NIBBLETYPE South = 0x03,
+	NIBBLETYPE West = 0x04,
 	bool AssertIfNotMatched = false
 >
 class cYawRotator:
@@ -250,13 +250,13 @@ public:
 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
+	NIBBLETYPE BitMask = 0x07,
+	NIBBLETYPE North = 0x02,
+	NIBBLETYPE East = 0x05,
+	NIBBLETYPE South = 0x03,
+	NIBBLETYPE West = 0x04,
+	NIBBLETYPE Up = 0x01,
+	NIBBLETYPE Down = 0x00
 >
 class cPitchYawRotator:
 	public cYawRotator<Base, BitMask, North, East, South, West>
-- 
cgit v1.2.3