Merge pull request #559 from osmarjunior/master

Fix bug when drawing mounts while walking
edubart · Aug 22, 2014 · 0909e18 · 0909e18
2 parents fa317c5 + 3557879
commit 0909e18
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/client/creature.cpp b/src/client/creature.cpp
@@ -877,6 +877,12 @@ int Creature::getDisplacementX()
         return 8;
     else if(m_outfit.getCategory() == ThingCategoryItem)
         return 0;
+
+    if(m_outfit.getMount() != 0) {
+        auto datType = g_things.rawGetThingType(m_outfit.getMount(), ThingCategoryCreature);
+        return datType->getDisplacementX();
+    }
+
     return Thing::getDisplacementX();
 }
 
@@ -886,6 +892,12 @@ int Creature::getDisplacementY()
         return 8;
     else if(m_outfit.getCategory() == ThingCategoryItem)
         return 0;
+
+    if(m_outfit.getMount() != 0) {
+        auto datType = g_things.rawGetThingType(m_outfit.getMount(), ThingCategoryCreature);
+        return datType->getDisplacementY();
+    }
+
     return Thing::getDisplacementY();
 }