summaryrefslogtreecommitdiffstats
path: root/src/Mobs
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2018-05-06 19:07:34 +0200
committerpeterbell10 <peterbell10@live.co.uk>2018-05-06 19:07:34 +0200
commitb9fdaf8a942ea2f79e48e3f735ba8916f3364e70 (patch)
tree41c6f10550a4e606d33ac84fe3968b69875aa1d4 /src/Mobs
parentGenerate cacti and sugarcane with different heights (#4137) (diff)
downloadcuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.gz
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.bz2
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.lz
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.xz
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.zst
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.zip
Diffstat (limited to 'src/Mobs')
-rw-r--r--src/Mobs/Enderman.cpp4
-rw-r--r--src/Mobs/Enderman.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Mobs/Enderman.cpp b/src/Mobs/Enderman.cpp
index 01e13713d..71ba4e79a 100644
--- a/src/Mobs/Enderman.cpp
+++ b/src/Mobs/Enderman.cpp
@@ -75,8 +75,8 @@ protected:
cEnderman::cEnderman(void) :
super("Enderman", mtEnderman, "entity.endermen.hurt", "entity.endermen.death", 0.5, 2.9),
m_bIsScreaming(false),
- CarriedBlock(E_BLOCK_AIR),
- CarriedMeta(0)
+ m_CarriedBlock(E_BLOCK_AIR),
+ m_CarriedMeta(0)
{
}
diff --git a/src/Mobs/Enderman.h b/src/Mobs/Enderman.h
index d8731b709..4f3f26119 100644
--- a/src/Mobs/Enderman.h
+++ b/src/Mobs/Enderman.h
@@ -24,8 +24,8 @@ public:
virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
bool IsScreaming(void) const {return m_bIsScreaming; }
- BLOCKTYPE GetCarriedBlock(void) const {return CarriedBlock; }
- NIBBLETYPE GetCarriedMeta(void) const {return CarriedMeta; }
+ BLOCKTYPE GetCarriedBlock(void) const {return m_CarriedBlock; }
+ NIBBLETYPE GetCarriedMeta(void) const {return m_CarriedMeta; }
/** Returns if the current sky light level is sufficient for the enderman to become aggravated */
bool CheckLight(void);
@@ -33,7 +33,7 @@ public:
private:
bool m_bIsScreaming;
- BLOCKTYPE CarriedBlock;
- NIBBLETYPE CarriedMeta;
+ BLOCKTYPE m_CarriedBlock;
+ NIBBLETYPE m_CarriedMeta;
} ;