From 9ee47e59995f858ec531b3ee467f131594e4ba1f Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 13 Apr 2020 18:38:06 +0200 Subject: Using Super. --- src/Simulator/DelayedFluidSimulator.cpp | 2 +- src/Simulator/DelayedFluidSimulator.h | 5 +++-- src/Simulator/FloodyFluidSimulator.cpp | 2 +- src/Simulator/FloodyFluidSimulator.h | 6 ++++-- src/Simulator/FluidSimulator.cpp | 2 +- src/Simulator/FluidSimulator.h | 5 +++-- .../IncrementalRedstoneSimulator/CommandBlockHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/DropSpenserHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/HopperHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator.h | 10 ++++++---- .../IncrementalRedstoneSimulator/NoteBlockHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/PoweredRailHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/PressurePlateHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/RedstoneBlockHandler.h | 6 ++++-- .../RedstoneComparatorHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/RedstoneToggleHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/RedstoneWireHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/SmallGateHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/SolidBlockHandler.h | 6 ++++-- src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/TrappedChestHandler.h | 6 ++++-- .../IncrementalRedstoneSimulator/TripwireHookHandler.h | 6 ++++-- src/Simulator/NoopFluidSimulator.h | 9 +++++---- src/Simulator/NoopRedstoneSimulator.h | 9 +++++---- src/Simulator/RedstoneSimulator.h | 9 +++++---- src/Simulator/VanillaFluidSimulator.cpp | 3 ++- src/Simulator/VanillaFluidSimulator.h | 14 +++++++++++--- src/Simulator/VaporizeFluidSimulator.cpp | 2 +- src/Simulator/VaporizeFluidSimulator.h | 5 +++-- 32 files changed, 123 insertions(+), 68 deletions(-) (limited to 'src/Simulator') diff --git a/src/Simulator/DelayedFluidSimulator.cpp b/src/Simulator/DelayedFluidSimulator.cpp index c3e262dec..784e40250 100644 --- a/src/Simulator/DelayedFluidSimulator.cpp +++ b/src/Simulator/DelayedFluidSimulator.cpp @@ -66,7 +66,7 @@ cDelayedFluidSimulatorChunkData::~cDelayedFluidSimulatorChunkData() // cDelayedFluidSimulator: cDelayedFluidSimulator::cDelayedFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid, int a_TickDelay) : - super(a_World, a_Fluid, a_StationaryFluid), + Super(a_World, a_Fluid, a_StationaryFluid), m_TickDelay(a_TickDelay), m_AddSlotNum(a_TickDelay - 1), m_SimSlotNum(0), diff --git a/src/Simulator/DelayedFluidSimulator.h b/src/Simulator/DelayedFluidSimulator.h index 78619a608..4627cdce2 100644 --- a/src/Simulator/DelayedFluidSimulator.h +++ b/src/Simulator/DelayedFluidSimulator.h @@ -45,12 +45,13 @@ public: -class cDelayedFluidSimulator : +class cDelayedFluidSimulator: public cFluidSimulator { - typedef cFluidSimulator super; + using Super = cFluidSimulator; public: + cDelayedFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid, int a_TickDelay); // cSimulator overrides: diff --git a/src/Simulator/FloodyFluidSimulator.cpp b/src/Simulator/FloodyFluidSimulator.cpp index 14573e0de..c63d7e965 100644 --- a/src/Simulator/FloodyFluidSimulator.cpp +++ b/src/Simulator/FloodyFluidSimulator.cpp @@ -38,7 +38,7 @@ cFloodyFluidSimulator::cFloodyFluidSimulator( int a_TickDelay, int a_NumNeighborsForSource ) : - super(a_World, a_Fluid, a_StationaryFluid, a_TickDelay), + Super(a_World, a_Fluid, a_StationaryFluid, a_TickDelay), m_Falloff(a_Falloff), m_NumNeighborsForSource(a_NumNeighborsForSource) { diff --git a/src/Simulator/FloodyFluidSimulator.h b/src/Simulator/FloodyFluidSimulator.h index 1139da1fc..6923bb637 100644 --- a/src/Simulator/FloodyFluidSimulator.h +++ b/src/Simulator/FloodyFluidSimulator.h @@ -16,15 +16,17 @@ -class cFloodyFluidSimulator : +class cFloodyFluidSimulator: public cDelayedFluidSimulator { - typedef cDelayedFluidSimulator super; + using Super = cDelayedFluidSimulator; public: + cFloodyFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid, NIBBLETYPE a_Falloff, int a_TickDelay, int a_NumNeighborsForSource); protected: + NIBBLETYPE m_Falloff; int m_NumNeighborsForSource; diff --git a/src/Simulator/FluidSimulator.cpp b/src/Simulator/FluidSimulator.cpp index 69a8375aa..ca9fa3b1b 100644 --- a/src/Simulator/FluidSimulator.cpp +++ b/src/Simulator/FluidSimulator.cpp @@ -8,7 +8,7 @@ cFluidSimulator::cFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid) : - super(a_World), + Super(a_World), m_FluidBlock(a_Fluid), m_StationaryFluidBlock(a_StationaryFluid) { diff --git a/src/Simulator/FluidSimulator.h b/src/Simulator/FluidSimulator.h index 7e79c2751..e9157fa69 100644 --- a/src/Simulator/FluidSimulator.h +++ b/src/Simulator/FluidSimulator.h @@ -34,12 +34,13 @@ public: -class cFluidSimulator : +class cFluidSimulator: public cSimulator { - typedef cSimulator super; + using Super = cSimulator; public: + cFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid); // cSimulator overrides: 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 diff --git a/src/Simulator/NoopFluidSimulator.h b/src/Simulator/NoopFluidSimulator.h index 11bbf061d..6fc8b3689 100644 --- a/src/Simulator/NoopFluidSimulator.h +++ b/src/Simulator/NoopFluidSimulator.h @@ -15,14 +15,15 @@ -class cNoopFluidSimulator : +class cNoopFluidSimulator: public cFluidSimulator { - typedef cFluidSimulator super; + using Super = cFluidSimulator; public: - cNoopFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid) : - super(a_World, a_Fluid, a_StationaryFluid) + + cNoopFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid): + Super(a_World, a_Fluid, a_StationaryFluid) { } diff --git a/src/Simulator/NoopRedstoneSimulator.h b/src/Simulator/NoopRedstoneSimulator.h index d9e8e00f5..4959882fa 100644 --- a/src/Simulator/NoopRedstoneSimulator.h +++ b/src/Simulator/NoopRedstoneSimulator.h @@ -7,14 +7,15 @@ -class cRedstoneNoopSimulator : +class cRedstoneNoopSimulator: public cRedstoneSimulator { - typedef cRedstoneSimulator super; + using Super = cRedstoneSimulator; + public: - cRedstoneNoopSimulator(cWorld & a_World) : - super(a_World) + cRedstoneNoopSimulator(cWorld & a_World): + Super(a_World) { } diff --git a/src/Simulator/RedstoneSimulator.h b/src/Simulator/RedstoneSimulator.h index 8a29d7a29..f90026374 100644 --- a/src/Simulator/RedstoneSimulator.h +++ b/src/Simulator/RedstoneSimulator.h @@ -19,14 +19,15 @@ inline cRedstoneSimulatorChunkData::~cRedstoneSimulatorChunkData() {} -class cRedstoneSimulator : +class cRedstoneSimulator: public cSimulator { - typedef cSimulator super; + using Super = cSimulator; + public: - cRedstoneSimulator(cWorld & a_World) : - super(a_World) + cRedstoneSimulator(cWorld & a_World): + Super(a_World) { } diff --git a/src/Simulator/VanillaFluidSimulator.cpp b/src/Simulator/VanillaFluidSimulator.cpp index 0fc84be59..b1c690785 100644 --- a/src/Simulator/VanillaFluidSimulator.cpp +++ b/src/Simulator/VanillaFluidSimulator.cpp @@ -28,7 +28,8 @@ cVanillaFluidSimulator::cVanillaFluidSimulator( NIBBLETYPE a_Falloff, int a_TickDelay, int a_NumNeighborsForSource -) : super(a_World, a_Fluid, a_StationaryFluid, a_Falloff, a_TickDelay, a_NumNeighborsForSource) +): + Super(a_World, a_Fluid, a_StationaryFluid, a_Falloff, a_TickDelay, a_NumNeighborsForSource) { } diff --git a/src/Simulator/VanillaFluidSimulator.h b/src/Simulator/VanillaFluidSimulator.h index 1e47c3ddf..96ce8dc70 100644 --- a/src/Simulator/VanillaFluidSimulator.h +++ b/src/Simulator/VanillaFluidSimulator.h @@ -13,13 +13,21 @@ -class cVanillaFluidSimulator : +class cVanillaFluidSimulator: public cFloodyFluidSimulator { - typedef cFloodyFluidSimulator super; + using Super = cFloodyFluidSimulator; public: - cVanillaFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid, NIBBLETYPE a_Falloff, int a_TickDelay, int a_NumNeighborsForSource); + + cVanillaFluidSimulator( + cWorld & a_World, + BLOCKTYPE a_Fluid, + BLOCKTYPE a_StationaryFluid, + NIBBLETYPE a_Falloff, + int a_TickDelay, + int a_NumNeighborsForSource + ); protected: // cFloodyFluidSimulator overrides: diff --git a/src/Simulator/VaporizeFluidSimulator.cpp b/src/Simulator/VaporizeFluidSimulator.cpp index 441c0bb6c..d0c590d16 100644 --- a/src/Simulator/VaporizeFluidSimulator.cpp +++ b/src/Simulator/VaporizeFluidSimulator.cpp @@ -14,7 +14,7 @@ cVaporizeFluidSimulator::cVaporizeFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid) : - super(a_World, a_Fluid, a_StationaryFluid) + Super(a_World, a_Fluid, a_StationaryFluid) { } diff --git a/src/Simulator/VaporizeFluidSimulator.h b/src/Simulator/VaporizeFluidSimulator.h index 7a7006309..d3ae28db3 100644 --- a/src/Simulator/VaporizeFluidSimulator.h +++ b/src/Simulator/VaporizeFluidSimulator.h @@ -16,12 +16,13 @@ -class cVaporizeFluidSimulator : +class cVaporizeFluidSimulator: public cFluidSimulator { - typedef cFluidSimulator super; + using Super = cFluidSimulator; public: + cVaporizeFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid); // cSimulator overrides: -- cgit v1.2.3