2 files changed, 10 insertions, 1 deletions

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index b6e22c0ee..8c93fea2a 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -89,6 +89,7 @@ cMonster::cMonster(const AString & a_ConfigName, eMonsterType a_MobType, const A
 	, m_DropChanceBoots(0.085f)
 	, m_CanPickUpLoot(true)
 	, m_BurnsInDaylight(false)
+	, m_RelativeWalkSpeed(1.0)
 {
 	if (!a_ConfigName.empty())
 	{
@@ -282,7 +283,7 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
 			}
 		}
 
-		Vector3f Distance = m_Destination - GetPosition();
+		Vector3d Distance = m_Destination - GetPosition();
 		if (!ReachedDestination() && !ReachedFinalDestination())  // If we haven't reached any sort of destination, move
 		{
 			Distance.y = 0;
@@ -302,6 +303,9 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
 				Distance *= 0.25f;
 			}
 
+			// Apply walk speed:
+			Distance *= m_RelativeWalkSpeed;
+
 			AddSpeedX(Distance.x);
 			AddSpeedZ(Distance.z);
 
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 60bf36c7a..ef94262f6 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -102,6 +102,9 @@ public:
 	/// Sets whether the mob burns in daylight. Only evaluated at next burn-decision tick
 	void SetBurnsInDaylight(bool a_BurnsInDaylight) { m_BurnsInDaylight = a_BurnsInDaylight; }
 
+	double GetRelativeWalkSpeed(void) const { return m_RelativeWalkSpeed; }  // tolua_export
+	void SetRelativeWalkSpeed(double a_WalkSpeed) { m_RelativeWalkSpeed = a_WalkSpeed; }  // tolua_export
+
 	// Overridables to handle ageable mobs
 	virtual bool IsBaby    (void) const { return false; }
 	virtual bool IsTame    (void) const { return false; }
@@ -212,6 +215,8 @@ protected:
 	void HandleDaylightBurning(cChunk & a_Chunk);
 	bool m_BurnsInDaylight;
 
+	double m_RelativeWalkSpeed;
+
 	/** Adds a random number of a_Item between a_Min and a_Max to itemdrops a_Drops*/
 	void AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, short a_Item, short a_ItemHealth = 0);