From 9ee47e59995f858ec531b3ee467f131594e4ba1f Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 13 Apr 2020 18:38:06 +0200 Subject: Using Super. --- .../IncrementalRedstoneSimulator/CommandBlockHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/DropSpenserHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/HopperHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator.h | 10 ++++++---- src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/PoweredRailHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/PressurePlateHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/RedstoneBlockHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/RedstoneComparatorHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/RedstoneToggleHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/RedstoneWireHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/SmallGateHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/SolidBlockHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/TrappedChestHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/TripwireHookHandler.h | 6 ++++-- 19 files changed, 78 insertions(+), 40 deletions(-) (limited to 'src/Simulator/IncrementalRedstoneSimulator') diff --git a/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h b/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h index f059c5fb3..6bdd580a9 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h @@ -8,9 +8,11 @@ -class cCommandBlockHandler : public cRedstoneHandler +class cCommandBlockHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h index d29a2f4da..ecd1d93b3 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h @@ -8,9 +8,11 @@ -class cDoorHandler : public cRedstoneHandler +class cDoorHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h b/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h index 4dd8b4493..131d2eb6c 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h @@ -8,9 +8,11 @@ -class cDropSpenserHandler : public cRedstoneHandler +class cDropSpenserHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: inline static bool IsActivated(NIBBLETYPE a_Meta) diff --git a/src/Simulator/IncrementalRedstoneSimulator/HopperHandler.h b/src/Simulator/IncrementalRedstoneSimulator/HopperHandler.h index 6012db1e1..32b615ffa 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/HopperHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/HopperHandler.h @@ -8,9 +8,11 @@ -class cHopperHandler : public cRedstoneHandler +class cHopperHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.h b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.h index 850bb30c4..4ef9801a3 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.h +++ b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.h @@ -8,13 +8,15 @@ -class cIncrementalRedstoneSimulator : +class cIncrementalRedstoneSimulator: public cRedstoneSimulator { - typedef cRedstoneSimulator super; + using Super = cRedstoneSimulator; + public: - cIncrementalRedstoneSimulator(cWorld & a_World) : - super(a_World) + + cIncrementalRedstoneSimulator(cWorld & a_World): + Super(a_World) { } diff --git a/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h b/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h index 347778881..f6dfc7c97 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h @@ -8,9 +8,11 @@ -class cNoteBlockHandler : public cRedstoneHandler +class cNoteBlockHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h b/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h index b91596be9..0929951d5 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h @@ -8,9 +8,11 @@ -class cPistonHandler : public cRedstoneHandler +class cPistonHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h b/src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h index 3c02bf5ec..d1d44a270 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h @@ -7,9 +7,11 @@ -class cPoweredRailHandler : public cRedstoneHandler +class cPoweredRailHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: static Vector3i GetPoweredRailAdjacentXZCoordinateOffset(NIBBLETYPE a_Meta) // Not in cBlockRailHandler since specific to powered rails diff --git a/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h b/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h index 1eeaf2afa..0944c5f8e 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h @@ -9,9 +9,11 @@ -class cPressurePlateHandler : public cRedstoneHandler +class cPressurePlateHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneBlockHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneBlockHandler.h index 441f802c3..98d373002 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneBlockHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneBlockHandler.h @@ -7,9 +7,11 @@ -class cRedstoneBlockHandler : public cRedstoneHandler +class cRedstoneBlockHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h index 1f78082c4..3c5dae98f 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h @@ -8,9 +8,11 @@ -class cRedstoneComparatorHandler : public cRedstoneHandler +class cRedstoneComparatorHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: unsigned char GetFrontPowerLevel(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, unsigned char a_HighestSidePowerLevel, unsigned char a_HighestRearPowerLevel) const diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h index 0263d47cf..9a0e26100 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h @@ -8,9 +8,11 @@ -class cRedstoneRepeaterHandler : public cRedstoneHandler +class cRedstoneRepeaterHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: inline static bool IsOn(BLOCKTYPE a_Block) diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h index ad64f76db..c56b09c7b 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h @@ -9,9 +9,11 @@ -class cRedstoneToggleHandler : public cRedstoneHandler +class cRedstoneToggleHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: inline static Vector3i GetPositionAttachedTo(Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta) diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneWireHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneWireHandler.h index 09b16fb25..32be166b1 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneWireHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneWireHandler.h @@ -7,9 +7,11 @@ -class cRedstoneWireHandler : public cRedstoneHandler +class cRedstoneWireHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: inline static bool IsDirectlyConnectingMechanism(BLOCKTYPE a_Block) diff --git a/src/Simulator/IncrementalRedstoneSimulator/SmallGateHandler.h b/src/Simulator/IncrementalRedstoneSimulator/SmallGateHandler.h index 05e21429d..48238f4eb 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/SmallGateHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/SmallGateHandler.h @@ -7,9 +7,11 @@ -class cSmallGateHandler : public cRedstoneHandler +class cSmallGateHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/SolidBlockHandler.h b/src/Simulator/IncrementalRedstoneSimulator/SolidBlockHandler.h index b8b9b3bed..5b6bafaa3 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/SolidBlockHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/SolidBlockHandler.h @@ -7,9 +7,11 @@ -class cSolidBlockHandler : public cRedstoneHandler +class cSolidBlockHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h index 5c739baba..1ded2a733 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h @@ -7,9 +7,11 @@ -class cTNTHandler : public cRedstoneHandler +class cTNTHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h index f6bd81930..e8483a73a 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h @@ -8,9 +8,11 @@ -class cTrappedChestHandler : public cRedstoneHandler +class cTrappedChestHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override diff --git a/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h index 132df3327..6a857cd7c 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h @@ -8,9 +8,11 @@ -class cTripwireHookHandler : public cRedstoneHandler +class cTripwireHookHandler: + public cRedstoneHandler { - typedef cRedstoneHandler super; + using Super = cRedstoneHandler; + public: virtual unsigned char GetPowerDeliveredToPosition(cWorld & a_World, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override -- cgit v1.2.3