summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2014-08-21 21:37:41 +0200
committerSamuel Barney <samjbarney@gmail.com>2014-08-21 21:37:41 +0200
commit6db727c60c01264dc9a9c209c5b335da8f53cd64 (patch)
tree1ec865e37c74c571de0bc7249d1b5f17dd8f5a1c /src/WorldStorage
parentcommented out unused functions (diff)
downloadcuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar
cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.gz
cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.bz2
cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.lz
cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.xz
cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.tar.zst
cuberite-6db727c60c01264dc9a9c209c5b335da8f53cd64.zip
Diffstat (limited to 'src/WorldStorage')
-rw-r--r--src/WorldStorage/FastNBT.cpp2
-rw-r--r--src/WorldStorage/NBTChunkSerializer.h10
-rw-r--r--src/WorldStorage/WSSAnvil.h8
-rw-r--r--src/WorldStorage/WSSCompact.h16
-rw-r--r--src/WorldStorage/WorldStorage.cpp8
-rw-r--r--src/WorldStorage/WorldStorage.h2
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 a41268f4c..8ddf72115 100644
--- a/src/WorldStorage/WSSAnvil.h
+++ b/src/WorldStorage/WSSAnvil.h
@@ -229,10 +229,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 707e8f929..6e0d36eed 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 dd07ecb64..148dc97d0 100644
--- a/src/WorldStorage/WorldStorage.h
+++ b/src/WorldStorage/WorldStorage.h
@@ -128,7 +128,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