diff options
author | madmaxoft <github@xoft.cz> | 2014-04-19 13:05:58 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-04-19 13:05:58 +0200 |
commit | 6eac5867945044eda62312f9657ff0c808ac2080 (patch) | |
tree | a7028618f1d9d5c5c1cc24edc0bdf8d44d0fcbb6 /src | |
parent | Merge remote-tracking branch 'origin/Beacons' (diff) | |
download | cuberite-6eac5867945044eda62312f9657ff0c808ac2080.tar cuberite-6eac5867945044eda62312f9657ff0c808ac2080.tar.gz cuberite-6eac5867945044eda62312f9657ff0c808ac2080.tar.bz2 cuberite-6eac5867945044eda62312f9657ff0c808ac2080.tar.lz cuberite-6eac5867945044eda62312f9657ff0c808ac2080.tar.xz cuberite-6eac5867945044eda62312f9657ff0c808ac2080.tar.zst cuberite-6eac5867945044eda62312f9657ff0c808ac2080.zip |
Diffstat (limited to '')
-rw-r--r-- | src/BlockEntities/BeaconEntity.cpp | 17 | ||||
-rw-r--r-- | src/BlockEntities/BeaconEntity.h | 14 |
2 files changed, 18 insertions, 13 deletions
diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp index dd340f24f..0914353eb 100644 --- a/src/BlockEntities/BeaconEntity.cpp +++ b/src/BlockEntities/BeaconEntity.cpp @@ -17,7 +17,7 @@ cBeaconEntity::cBeaconEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * -int cBeaconEntity::GetPyramidLevel() +int cBeaconEntity::GetPyramidLevel(void) { cBlockArea Area; int MinY = GetPosY() - 4; @@ -33,12 +33,9 @@ int cBeaconEntity::GetPyramidLevel() Area.Read( m_World, - GetPosX() - 4, - GetPosX() + 4, - MinY, - MaxY, - GetPosZ() - 4, - GetPosZ() + 4, + GetPosX() - 4, GetPosX() + 4, + MinY, MaxY, + GetPosZ() - 4, GetPosZ() + 4, cBlockArea::baTypes ); @@ -112,4 +109,8 @@ void cBeaconEntity::SendTo(cClientHandle & a_Client) void cBeaconEntity::UsedBy(cPlayer * a_Player) { -}
\ No newline at end of file +} + + + + diff --git a/src/BlockEntities/BeaconEntity.h b/src/BlockEntities/BeaconEntity.h index 1dfd745b2..b1df68bc4 100644 --- a/src/BlockEntities/BeaconEntity.h +++ b/src/BlockEntities/BeaconEntity.h @@ -23,18 +23,22 @@ class cBeaconEntity : public: - // The initial constructor + /** The initial constructor */ cBeaconEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World); - // Returns the amount of layers the pyramid below the beacon has. + /** Returns the amount of layers the pyramid below the beacon has. */ int GetPyramidLevel(void); - // Returns true if the block is a diamond block, an golden block, an iron block or an emerald block. - bool IsMineralBlock(BLOCKTYPE a_BlockType); + /** Returns true if the block is a diamond block, a golden block, an iron block or an emerald block. */ + static bool IsMineralBlock(BLOCKTYPE a_BlockType); // cBlockEntity overrides: virtual void SaveToJson(Json::Value& a_Value ) override; virtual void SendTo(cClientHandle & a_Client) override; virtual void UsedBy(cPlayer * a_Player) override; virtual bool Tick(float a_Dt, cChunk & /* a_Chunk */) override; -} ;
\ No newline at end of file +} ; + + + + |