From b9fdaf8a942ea2f79e48e3f735ba8916f3364e70 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Sun, 6 May 2018 19:07:34 +0200 Subject: Use clang-tidy to check more code conventions (#4214) * Create clang-tidy.sh * Add clang-tidy to circle.yml * Fixed some naming violations Fixes #4164 --- src/Mobs/Enderman.cpp | 4 ++-- src/Mobs/Enderman.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Mobs') 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; } ; -- cgit v1.2.3