summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authortycho <work.tycho@gmail.com>2015-05-23 16:33:52 +0200
committertycho <work.tycho@gmail.com>2015-05-23 16:33:52 +0200
commit81c0116cf1c0b06e24f9f69e219c3f1e302d81e2 (patch)
tree8df120fde19c9c27f5a8681a7952aa9e802bc800 /src/World.h
parentMerge branch 'master' into PreventNewWarnings (diff)
parentMerge pull request #2117 from Seadragon91/clang_errors (diff)
downloadcuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar
cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.gz
cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.bz2
cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.lz
cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.xz
cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.zst
cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.zip
Diffstat (limited to '')
-rw-r--r--src/World.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/World.h b/src/World.h
index d29a89e65..8f3f07dc2 100644
--- a/src/World.h
+++ b/src/World.h
@@ -203,10 +203,10 @@ public:
bool VillagersShouldHarvestCrops(void) const { return m_VillagersShouldHarvestCrops; }
- virtual eDimension GetDimension(void) const { return m_Dimension; }
+ virtual eDimension GetDimension(void) const override { return m_Dimension; }
/** Returns the world height at the specified coords; waits for the chunk to get loaded / generated */
- virtual int GetHeight(int a_BlockX, int a_BlockZ);
+ virtual int GetHeight(int a_BlockX, int a_BlockZ) override;
// tolua_end
@@ -253,7 +253,7 @@ public:
void BroadcastScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode);
void BroadcastScoreUpdate (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode);
void BroadcastDisplayObjective (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display);
- void BroadcastSoundEffect (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = nullptr); // tolua_export
+ void BroadcastSoundEffect (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = nullptr) override; // tolua_export
void BroadcastSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data, const cClientHandle * a_Exclude = nullptr); // tolua_export
void BroadcastSpawnEntity (cEntity & a_Entity, const cClientHandle * a_Exclude = nullptr);
void BroadcastTeleportEntity (const cEntity & a_Entity, const cClientHandle * a_Exclude = nullptr);
@@ -788,7 +788,7 @@ public:
bool IsWeatherWet(void) const { return !IsWeatherSunny(); }
/** Returns true if it is raining, stormy or snowing at the specified location. This takes into account biomes. */
- virtual bool IsWeatherWetAt(int a_BlockX, int a_BlockZ)
+ virtual bool IsWeatherWetAt(int a_BlockX, int a_BlockZ) override
{
return (IsWeatherWet() && !IsBiomeNoDownfall(GetBiomeAt(a_BlockX, a_BlockZ)));
}