summaryrefslogtreecommitdiffstats
path: root/src/Mobs
diff options
context:
space:
mode:
authorLukas Pioch <lukas@zgow.de>2017-05-20 08:16:28 +0200
committerLukas Pioch <lukas@zgow.de>2017-05-21 12:19:06 +0200
commite35ac1bfb9b63bf1e49dafdcce2033ff42d7c205 (patch)
treebbd086b1dbf8545575ce5da9ac3b2b7128e19899 /src/Mobs
parentFixed invisible chests (#3722) (diff)
downloadcuberite-e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205.tar
cuberite-e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205.tar.gz
cuberite-e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205.tar.bz2
cuberite-e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205.tar.lz
cuberite-e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205.tar.xz
cuberite-e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205.tar.zst
cuberite-e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/Horse.cpp4
-rw-r--r--src/Mobs/Horse.h2
-rw-r--r--src/Mobs/Monster.h2
3 files changed, 4 insertions, 4 deletions
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;