gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	modules/game_viplist/viplist.lua
This commit is contained in:
Jeffrey 2013-01-07 21:23:14 -06:00
parent 5921c8e420 702fce0be8
commit 9610106088
6 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/game_cooldown/cooldown.lua
View File

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

2
modules/game_interface/gameinterface.lua
View File

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

1
modules/game_interface/widgets/uigamemap.lua
View File

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

1
modules/game_interface/widgets/uiitem.lua
View File

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

2
modules/game_viplist/viplist.lua
View File

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

3
src/otclient/creature.cpp
View File

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