diff options
Diffstat (limited to 'src/WorldStorage')
| -rw-r--r-- | src/WorldStorage/FastNBT.cpp | 2 | ||||
| -rw-r--r-- | src/WorldStorage/NBTChunkSerializer.h | 10 | ||||
| -rw-r--r-- | src/WorldStorage/WSSAnvil.h | 8 | ||||
| -rw-r--r-- | src/WorldStorage/WSSCompact.h | 16 | ||||
| -rw-r--r-- | src/WorldStorage/WorldStorage.cpp | 8 | ||||
| -rw-r--r-- | src/WorldStorage/WorldStorage.h | 2 |
6 files changed, 23 insertions, 23 deletions
diff --git a/src/WorldStorage/FastNBT.cpp b/src/WorldStorage/FastNBT.cpp index c6294b99c..dff611970 100644 --- a/src/WorldStorage/FastNBT.cpp +++ b/src/WorldStorage/FastNBT.cpp @@ -11,7 +11,7 @@ // The number of NBT tags that are reserved when an NBT parsing is started. -// You can override this by using a cmdline define +// You can /*override*/ this by using a cmdline define #ifndef NBT_RESERVE_SIZE #define NBT_RESERVE_SIZE 200 #endif // NBT_RESERVE_SIZE diff --git a/src/WorldStorage/NBTChunkSerializer.h b/src/WorldStorage/NBTChunkSerializer.h index 4c229a65c..cd47bb72d 100644 --- a/src/WorldStorage/NBTChunkSerializer.h +++ b/src/WorldStorage/NBTChunkSerializer.h @@ -123,11 +123,11 @@ protected: void AddMinecartChestContents(cMinecartWithChest * a_Minecart); - // cChunkDataSeparateCollector overrides: - virtual void LightIsValid(bool a_IsLightValid) override; - virtual void BiomeData(const cChunkDef::BiomeMap * a_BiomeMap) override; - virtual void Entity(cEntity * a_Entity) override; - virtual void BlockEntity(cBlockEntity * a_Entity) override; + // cChunkDataSeparateCollector /*override*/s: + virtual void LightIsValid(bool a_IsLightValid) /*override*/; + virtual void BiomeData(const cChunkDef::BiomeMap * a_BiomeMap) /*override*/; + virtual void Entity(cEntity * a_Entity) /*override*/; + virtual void BlockEntity(cBlockEntity * a_Entity) /*override*/; } ; // class cNBTChunkSerializer diff --git a/src/WorldStorage/WSSAnvil.h b/src/WorldStorage/WSSAnvil.h index 591ec6757..a1f9b293b 100644 --- a/src/WorldStorage/WSSAnvil.h +++ b/src/WorldStorage/WSSAnvil.h @@ -236,10 +236,10 @@ protected: /// Copies a_Length bytes of data from the specified NBT Tag's Child into the a_Destination buffer void CopyNBTData(const cParsedNBT & a_NBT, int a_Tag, const AString & a_ChildName, char * a_Destination, size_t a_Length); - // cWSSchema overrides: - virtual bool LoadChunk(const cChunkCoords & a_Chunk) override; - virtual bool SaveChunk(const cChunkCoords & a_Chunk) override; - virtual const AString GetName(void) const override {return "anvil"; } + // cWSSchema /*override*/s: + virtual bool LoadChunk(const cChunkCoords & a_Chunk) /*override*/; + virtual bool SaveChunk(const cChunkCoords & a_Chunk) /*override*/; + virtual const AString GetName(void) const /*override*/ {return "anvil"; } } ; diff --git a/src/WorldStorage/WSSCompact.h b/src/WorldStorage/WSSCompact.h index 83e9cb49f..88910fa96 100644 --- a/src/WorldStorage/WSSCompact.h +++ b/src/WorldStorage/WSSCompact.h @@ -40,10 +40,10 @@ protected: Json::Value m_Root; bool m_HasJsonData; - // cChunkDataCollector overrides: - virtual void Entity (cEntity * a_Entity) override; - virtual void BlockEntity (cBlockEntity * a_Entity) override; - virtual void LightIsValid (bool a_IsLightValid) override; + // cChunkDataCollector /*override*/s: + virtual void Entity (cEntity * a_Entity) /*override*/; + virtual void BlockEntity (cBlockEntity * a_Entity) /*override*/; + virtual void LightIsValid (bool a_IsLightValid) /*override*/; } ; @@ -140,10 +140,10 @@ protected: void LoadEntitiesFromJson(Json::Value & a_Value, cEntityList & a_Entities, cBlockEntityList & a_BlockEntities, cWorld * a_World); - // cWSSchema overrides: - virtual bool LoadChunk(const cChunkCoords & a_Chunk) override; - virtual bool SaveChunk(const cChunkCoords & a_Chunk) override; - virtual const AString GetName(void) const override {return "compact"; } + // cWSSchema /*override*/s: + virtual bool LoadChunk(const cChunkCoords & a_Chunk) /*override*/; + virtual bool SaveChunk(const cChunkCoords & a_Chunk) /*override*/; + virtual const AString GetName(void) const /*override*/ {return "compact"; } } ; diff --git a/src/WorldStorage/WorldStorage.cpp b/src/WorldStorage/WorldStorage.cpp index 667a28470..c35bbbad0 100644 --- a/src/WorldStorage/WorldStorage.cpp +++ b/src/WorldStorage/WorldStorage.cpp @@ -25,10 +25,10 @@ public: cWSSForgetful(cWorld * a_World) : cWSSchema(a_World) {} protected: - // cWSSchema overrides: - virtual bool LoadChunk(const cChunkCoords & a_Chunk) override {return false; } - virtual bool SaveChunk(const cChunkCoords & a_Chunk) override {return true; } - virtual const AString GetName(void) const override {return "forgetful"; } + // cWSSchema /*override*/s: + virtual bool LoadChunk(const cChunkCoords & a_Chunk) /*override*/ {return false; } + virtual bool SaveChunk(const cChunkCoords & a_Chunk) /*override*/ {return true; } + virtual const AString GetName(void) const /*override*/ {return "forgetful"; } } ; diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h index 5f89ead53..21f5ca25d 100644 --- a/src/WorldStorage/WorldStorage.h +++ b/src/WorldStorage/WorldStorage.h @@ -126,7 +126,7 @@ protected: void InitSchemas(int a_StorageCompressionFactor); - virtual void Execute(void) override; + virtual void Execute(void) /*override*/; cEvent m_Event; // Set when there's any addition to the queues |