diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:56:31 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:56:31 +0200 |
| commit | 28f66efe307150558f4ad2546e058370a828be3e (patch) | |
| tree | 2ef088aa2d1a8ae85007b34b463d5044847bf006 /src/World.cpp | |
| parent | Merge branch 'master' into ComponentRewrite (diff) | |
| download | cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.gz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.bz2 cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.lz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.xz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.zst cuberite-28f66efe307150558f4ad2546e058370a828be3e.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/World.cpp b/src/World.cpp index 50bc6224d..2a3336dee 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -98,7 +98,7 @@ protected: cWorld * m_World; - virtual void Execute(void) /*override*/ + virtual void Execute(void) override { for (;;) { @@ -150,7 +150,7 @@ protected: cLightingThread * m_Lighting; - virtual void Execute(void) /*override*/ + virtual void Execute(void) override { for (;;) { @@ -489,7 +489,7 @@ void cWorld::InitializeSpawn(void) class cTracerCallbacks : public cBlockTracer::cCallbacks { - virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/ + virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override { LOGD("Block {%d, %d, %d}: %d:%d (%s)", a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta, @@ -498,7 +498,7 @@ void cWorld::InitializeSpawn(void) return false; } - virtual bool OnNextBlockNoData(int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/ + virtual bool OnNextBlockNoData(int a_BlockX, int a_BlockY, int a_BlockZ) override { LOGD("Block {%d, %d, %d}: no data available", a_BlockX, a_BlockY, a_BlockZ @@ -506,19 +506,19 @@ void cWorld::InitializeSpawn(void) return false; } - virtual bool OnOutOfWorld(double a_BlockX, double a_BlockY, double a_BlockZ) /*override*/ + virtual bool OnOutOfWorld(double a_BlockX, double a_BlockY, double a_BlockZ) override { LOGD("Out of world at {%f, %f, %f}", a_BlockX, a_BlockY, a_BlockZ); return false; } - virtual bool OnIntoWorld(double a_BlockX, double a_BlockY, double a_BlockZ) /*override*/ + virtual bool OnIntoWorld(double a_BlockX, double a_BlockY, double a_BlockZ) override { LOGD("Into world at {%f, %f, %f}", a_BlockX, a_BlockY, a_BlockZ); return false; } - virtual void OnNoMoreHits(void) /*override*/ + virtual void OnNoMoreHits(void) override { LOGD("No more hits"); } @@ -559,7 +559,7 @@ void cWorld::Start(void) IniFile.AddKeyComment(" LinkedWorlds", "This section governs portal world linkage; leave a value blank to disabled that associated method of teleportation"); } - // The presence of a configuration value /*override*/s everything + // The presence of a configuration value overrides everything // If no configuration value is found, GetDimension() is written to file and the variable is written to again to ensure that cosmic rays haven't sneakily changed its value m_Dimension = StringToDimension(IniFile.GetValueSet("General", "Dimension", DimensionToString(GetDimension()))); @@ -2853,7 +2853,7 @@ bool cWorld::SetCommandBlockCommand(int a_BlockX, int a_BlockY, int a_BlockZ, co public: cUpdateCommandBlock(const AString & a_Command) : m_Command(a_Command) {} - virtual bool Item(cCommandBlockEntity * a_CommandBlock) /*override*/ + virtual bool Item(cCommandBlockEntity * a_CommandBlock) override { a_CommandBlock->SetCommand(m_Command); return false; |