diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/BlockEntities/CommandBlockEntity.cpp | 2 | ||||
| -rw-r--r-- | src/Generating/IntGen.h | 2 | ||||
| -rw-r--r-- | src/Generating/MineShafts.cpp | 4 | ||||
| -rw-r--r-- | src/Generating/ProtIntGen.h | 2 | ||||
| -rw-r--r-- | src/Items/ItemMap.h | 2 | ||||
| -rw-r--r-- | src/Simulator/DelayedFluidSimulator.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp index 34b0fd5f5..b747501c8 100644 --- a/src/BlockEntities/CommandBlockEntity.cpp +++ b/src/BlockEntities/CommandBlockEntity.cpp @@ -166,7 +166,7 @@ void cCommandBlockEntity::Execute() public: CommandBlockOutCb(cCommandBlockEntity * a_CmdBlock) : m_CmdBlock(a_CmdBlock) {} - virtual void Out(const AString & a_Text) + virtual void Out(const AString & a_Text) override { // Overwrite field m_CmdBlock->SetLastOutput(cClientHandle::FormatChatPrefix(m_CmdBlock->GetWorld()->ShouldUseChatPrefixes(), "SUCCESS", cChatColor::Green, cChatColor::White) + a_Text); diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h index 786c6099d..4ef8c3452 100644 --- a/src/Generating/IntGen.h +++ b/src/Generating/IntGen.h @@ -582,7 +582,7 @@ public: } - virtual void GetInts(int a_MinX, int a_MinZ, typename Super::Values & a_Values) + virtual void GetInts(int a_MinX, int a_MinZ, typename Super::Values & a_Values) override { // Generate the underlying biome groups: int lowerValues[m_UnderlyingSizeX * m_UnderlyingSizeZ]; diff --git a/src/Generating/MineShafts.cpp b/src/Generating/MineShafts.cpp index 2045533c1..189b28095 100644 --- a/src/Generating/MineShafts.cpp +++ b/src/Generating/MineShafts.cpp @@ -256,7 +256,7 @@ public: int a_ProbLevelCorridor, int a_ProbLevelCrossing, int a_ProbLevelStaircase ); - ~cMineShaftSystem(); + virtual ~cMineShaftSystem() override; /** Creates new cMineShaft descendant connected at the specified point, heading the specified direction, if it fits, appends it to the list and calls its AppendBranches() @@ -271,7 +271,7 @@ public: bool CanAppend(const cCuboid & a_BoundingBox); // cGridStructGen::cStructure overrides: - virtual void DrawIntoChunk(cChunkDesc & a_Chunk); + virtual void DrawIntoChunk(cChunkDesc & a_Chunk) override; } ; diff --git a/src/Generating/ProtIntGen.h b/src/Generating/ProtIntGen.h index 4672b4209..87e13c6cc 100644 --- a/src/Generating/ProtIntGen.h +++ b/src/Generating/ProtIntGen.h @@ -847,7 +847,7 @@ public: } - virtual void GetInts(int a_MinX, int a_MinZ, size_t a_SizeX, size_t a_SizeZ, int *a_Values) + virtual void GetInts(int a_MinX, int a_MinZ, size_t a_SizeX, size_t a_SizeZ, int * a_Values) override { // Generate the underlying biome groups: size_t lowerSizeX = a_SizeX + 2; diff --git a/src/Items/ItemMap.h b/src/Items/ItemMap.h index 2d939676a..59fddd3fb 100644 --- a/src/Items/ItemMap.h +++ b/src/Items/ItemMap.h @@ -21,7 +21,7 @@ public: { } - virtual void OnUpdate(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item) + virtual void OnUpdate(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item) override { cMap * Map = a_World->GetMapManager().GetMapData(static_cast<unsigned>(a_Item.m_ItemDamage)); diff --git a/src/Simulator/DelayedFluidSimulator.h b/src/Simulator/DelayedFluidSimulator.h index 3022c9753..1a9f42a65 100644 --- a/src/Simulator/DelayedFluidSimulator.h +++ b/src/Simulator/DelayedFluidSimulator.h @@ -35,7 +35,7 @@ public: } ; cDelayedFluidSimulatorChunkData(int a_TickDelay); - virtual ~cDelayedFluidSimulatorChunkData(); + virtual ~cDelayedFluidSimulatorChunkData() override; /** Slots, one for each delay tick, each containing the blocks to simulate */ cSlot * m_Slots; |