From e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205 Mon Sep 17 00:00:00 2001 From: Lukas Pioch Date: Sat, 20 May 2017 08:16:28 +0200 Subject: Clang 5.0 fixes - Added override keyword - Removed inherited member variables --- src/Mobs/Horse.cpp | 4 ++-- src/Mobs/Horse.h | 2 +- src/Mobs/Monster.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Mobs') diff --git a/src/Mobs/Horse.cpp b/src/Mobs/Horse.cpp index ab06704d6..978471b8d 100644 --- a/src/Mobs/Horse.cpp +++ b/src/Mobs/Horse.cpp @@ -24,7 +24,7 @@ cHorse::cHorse(int Type, int Color, int Style, int TameTimes) : m_TimesToTame(TameTimes), m_TameAttemptTimes(0), m_RearTickCount(0), - m_Speed(20.0) + m_MaxSpeed(20.0) { } @@ -183,6 +183,6 @@ void cHorse::HandleSpeedFromAttachee(float a_Forward, float a_Sideways) { if ((m_bIsTame) && (m_bIsSaddled)) { - super::HandleSpeedFromAttachee(a_Forward * m_Speed, a_Sideways * m_Speed); + super::HandleSpeedFromAttachee(a_Forward * m_MaxSpeed, a_Sideways * m_MaxSpeed); } } diff --git a/src/Mobs/Horse.h b/src/Mobs/Horse.h index 7afa5bf29..82026a0ee 100644 --- a/src/Mobs/Horse.h +++ b/src/Mobs/Horse.h @@ -44,7 +44,7 @@ private: bool m_bHasChest, m_bIsEating, m_bIsRearing, m_bIsMouthOpen, m_bIsTame, m_bIsSaddled; int m_Type, m_Color, m_Style, m_Armour, m_TimesToTame, m_TameAttemptTimes, m_RearTickCount; - float m_Speed; + float m_MaxSpeed; } ; diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h index 3aaadb57f..cb1e73942 100644 --- a/src/Mobs/Monster.h +++ b/src/Mobs/Monster.h @@ -44,7 +44,7 @@ public: */ cMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height); - ~cMonster(); + virtual ~cMonster() override; virtual void Destroyed() override; -- cgit v1.2.3