Clang 5.0 fixes

- Added override keyword
- Removed inherited member variables
This commit is contained in:
Lukas Pioch
2017-05-21 12:19:06 +02:00
parent 758622336e
commit e35ac1bfb9
64 changed files with 64 additions and 74 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ public:
CLASS_PROTODEF(cPawn)
cPawn(eEntityType a_EntityType, double a_Width, double a_Height);
~cPawn();
virtual ~cPawn() override;
virtual void Destroyed() override;
virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
+3 -2
View File
@@ -74,8 +74,6 @@ cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) :
m_IsCrouched(false),
m_IsSprinting(false),
m_IsFlying(false),
m_IsSwimming(false),
m_IsSubmerged(false),
m_IsFishing(false),
m_CanFly(false),
m_EatingFinishTick(-1),
@@ -96,6 +94,9 @@ cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) :
{
ASSERT(a_PlayerName.length() <= 16); // Otherwise this player could crash many clients...
m_IsSwimming = false;
m_IsSubmerged = false;
m_InventoryWindow = new cInventoryWindow(*this);
m_CurrentWindow = m_InventoryWindow;
m_InventoryWindow->OpenedByPlayer(*this);
+1 -3
View File
@@ -43,7 +43,7 @@ public:
virtual bool Initialize(cWorld & a_World) override;
virtual ~cPlayer();
virtual ~cPlayer() override;
virtual void SpawnOn(cClientHandle & a_Client) override;
@@ -645,8 +645,6 @@ protected:
bool m_IsCrouched;
bool m_IsSprinting;
bool m_IsFlying;
bool m_IsSwimming;
bool m_IsSubmerged;
bool m_IsFishing;
bool m_CanFly; // If this is true the player can fly. Even if he is not in creative.