From e2ef23fa5f345b460262a12c3f8ebc4c3d8591b4 Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Wed, 30 Oct 2013 16:58:18 -0600 Subject: Broken rail blocks now stack. --- source/Blocks/BlockRail.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source') diff --git a/source/Blocks/BlockRail.h b/source/Blocks/BlockRail.h index 0e83b952d..d411c1a24 100644 --- a/source/Blocks/BlockRail.h +++ b/source/Blocks/BlockRail.h @@ -51,6 +51,9 @@ public: } + void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) { cBlockHandler::ConvertToPickups(a_Pickups, 0); } + + virtual bool CanBeAt(int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override { if (a_RelY <= 0) -- cgit v1.2.3 From 47697b2667fbdd252997829558ce4fa38cedff6c Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Wed, 30 Oct 2013 19:09:12 -0600 Subject: Added missing conventions for windows. --- source/Blocks/BlockRail.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/Blocks/BlockRail.h b/source/Blocks/BlockRail.h index d411c1a24..ebf90f60f 100644 --- a/source/Blocks/BlockRail.h +++ b/source/Blocks/BlockRail.h @@ -51,7 +51,7 @@ public: } - void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) { cBlockHandler::ConvertToPickups(a_Pickups, 0); } + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { cBlockHandler::ConvertToPickups(a_Pickups, 0); } virtual bool CanBeAt(int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override -- cgit v1.2.3 From d85a2a1c2f07b19e86ccff126be09798850a3216 Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Thu, 31 Oct 2013 06:19:06 -0600 Subject: Adhering to project standards. --- source/Blocks/BlockRail.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/Blocks/BlockRail.h b/source/Blocks/BlockRail.h index ebf90f60f..24a101652 100644 --- a/source/Blocks/BlockRail.h +++ b/source/Blocks/BlockRail.h @@ -22,6 +22,8 @@ enum ENUM_PURE class cBlockRailHandler : public cBlockHandler { + typedef cBlockHandler super; + public: cBlockRailHandler(BLOCKTYPE a_BlockType) : cBlockHandler(a_BlockType) @@ -51,7 +53,10 @@ public: } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { cBlockHandler::ConvertToPickups(a_Pickups, 0); } + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override + { + super::ConvertToPickups(a_Pickups, 0); + } virtual bool CanBeAt(int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override -- cgit v1.2.3