summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockCarpet.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockCarpet.h45
1 files changed, 19 insertions, 26 deletions
diff --git a/src/Blocks/BlockCarpet.h b/src/Blocks/BlockCarpet.h
index 841e94b11..5d7320752 100644
--- a/src/Blocks/BlockCarpet.h
+++ b/src/Blocks/BlockCarpet.h
@@ -14,17 +14,14 @@
-class cBlockCarpetHandler final :
- public cBlockHandler
+class cBlockCarpetHandler final : public cBlockHandler
{
using Super = cBlockHandler;
-public:
-
+ public:
using Super::Super;
-private:
-
+ private:
virtual bool CanBeAt(const cChunk & a_Chunk, const Vector3i a_Position, const NIBBLETYPE a_Meta) const override
{
return (a_Position.y > 0) && (a_Chunk.GetBlock(a_Position.addedY(-1)) != E_BLOCK_AIR);
@@ -38,22 +35,22 @@ private:
{
switch (a_Meta)
{
- case E_META_CARPET_WHITE: return 14;
- case E_META_CARPET_ORANGE: return 15;
- case E_META_CARPET_MAGENTA: return 16;
- case E_META_CARPET_LIGHTBLUE: return 17;
- case E_META_CARPET_YELLOW: return 18;
+ case E_META_CARPET_WHITE: return 14;
+ case E_META_CARPET_ORANGE: return 15;
+ case E_META_CARPET_MAGENTA: return 16;
+ case E_META_CARPET_LIGHTBLUE: return 17;
+ case E_META_CARPET_YELLOW: return 18;
case E_META_CARPET_LIGHTGREEN: return 19;
- case E_META_CARPET_PINK: return 20;
- case E_META_CARPET_GRAY: return 21;
- case E_META_CARPET_LIGHTGRAY: return 22;
- case E_META_CARPET_CYAN: return 23;
- case E_META_CARPET_PURPLE: return 24;
- case E_META_CARPET_BLUE: return 25;
- case E_META_CARPET_BROWN: return 26;
- case E_META_CARPET_GREEN: return 27;
- case E_META_CARPET_RED: return 28;
- case E_META_CARPET_BLACK: return 29;
+ case E_META_CARPET_PINK: return 20;
+ case E_META_CARPET_GRAY: return 21;
+ case E_META_CARPET_LIGHTGRAY: return 22;
+ case E_META_CARPET_CYAN: return 23;
+ case E_META_CARPET_PURPLE: return 24;
+ case E_META_CARPET_BLUE: return 25;
+ case E_META_CARPET_BROWN: return 26;
+ case E_META_CARPET_GREEN: return 27;
+ case E_META_CARPET_RED: return 28;
+ case E_META_CARPET_BLACK: return 29;
default:
{
ASSERT(!"Unhandled meta in carpet handler!");
@@ -61,8 +58,4 @@ private:
}
}
}
-} ;
-
-
-
-
+};