Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/game_viplist/viplist.lua

modules/game_cooldown/cooldown.lua

@@ -79,7 +79,7 @@ function onSpellCooldown(iconId, duration)
   if not spellName then return end
   
   local ping = g_game.getPing()
-  if ping > 0 then local duration = duration - (ping/2) end
+  if ping > 0 then duration = duration - (ping/2) end
   local otcIconId = tonumber(SpellInfo[modules.game_spelllist.getSpelllistProfile()][spellName].icon)
   if not otcIconId and SpellIcons[SpellInfo[modules.game_spelllist.getSpelllistProfile()][spellName].icon] then
     otcIconId = SpellIcons[SpellInfo[modules.game_spelllist.getSpelllistProfile()][spellName].icon][1]
@@ -105,7 +105,7 @@ function onSpellGroupCooldown(groupId, duration)
   if not SpellGroups[groupId] then return end
   
   local ping = g_game.getPing()
-  if ping > 0 then local duration = duration - (ping/2) end
+  if ping > 0 then duration = duration - (ping/2) end
   local icon = contentsPanel:getChildById('groupIcon' .. SpellGroups[groupId])
   local progressRect = contentsPanel:getChildById('progressRect' .. SpellGroups[groupId])
   if icon then

modules/game_interface/gameinterface.lua

@@ -32,7 +32,7 @@ function init()
     onGameStart = show,
     onGameEnd = hide,
     onLoginAdvice = onLoginAdvice,
-    onWalk = onWalk,
+    onWalk = onWalk
   }, true)
 
   connect(LocalPlayer, {

modules/game_interface/widgets/uigamemap.lua

@@ -86,6 +86,7 @@ function UIGameMap:onMouseRelease(mousePosition, mouseButton)
 
   local ret = modules.game_interface.processMouseAction(mousePosition, mouseButton, autoWalkPos, lookThing, useThing, creatureThing, multiUseThing)
   if ret then
+    modules.game_interface.cancelAutoWalkCheck()
     self.cancelNextRelease = true
   end
 

modules/game_interface/widgets/uiitem.lua

@@ -87,6 +87,7 @@ function UIItem:onMouseRelease(mousePosition, mouseButton)
     self.cancelNextRelease = true
     return true
   elseif modules.game_interface.processMouseAction(mousePosition, mouseButton, nil, item, item, nil, item) then
+    modules.game_interface.cancelAutoWalkCheck()
     return true
   end
   return false

modules/game_viplist/viplist.lua

@@ -104,7 +104,7 @@ function onAddVip(id, name, state)
 
     if (state ~= VipState.Online and child.vipState ~= VipState.Online)
       or (state == VipState.Online and child.vipState == VipState.Online) then
-	  
+      
       local childText = child:getText():lower()
       local length = math.min(childText:len(), nameLower:len())
 

src/otclient/creature.cpp

@@ -672,6 +672,9 @@ Point Creature::getDrawOffset()
 int Creature::getStepDuration(bool ignoreDiagonal)
 {
     int speed = m_speed;
+    if(speed < 1)
+        return 0;
+
     if(g_game.getFeature(Otc::GameNewSpeedLaw))
         speed *= 2;