Little fixes

This commit is contained in:
Henrique Santiago 2013-02-20 21:50:45 -03:00
parent 33ce0aa704
commit f8b078ea91
4 changed files with 19 additions and 2 deletions

View File

@ -8,6 +8,8 @@ ProgressBar < UIProgressBar
$!on: $!on:
visible: false visible: false
margin-top: 0
margin-bottom: 0
height: 0 height: 0
LifeProgressBar < UIProgressBar LifeProgressBar < UIProgressBar

View File

@ -164,12 +164,27 @@ end
function setHealthTooltip(tooltip) function setHealthTooltip(tooltip)
healthTooltip = tooltip healthTooltip = tooltip
local localPlayer = g_game.getLocalPlayer()
if localPlayer then
healthBar:setTooltip(tr(healthTooltip, localPlayer:getHealth(), localPlayer:getMaxHealth()))
end
end end
function setManaTooltip(tooltip) function setManaTooltip(tooltip)
manaTooltip = tooltip manaTooltip = tooltip
local localPlayer = g_game.getLocalPlayer()
if localPlayer then
manaBar:setTooltip(tr(manaTooltip, localPlayer:getMana(), localPlayer:getMaxMana()))
end
end end
function setExperienceTooltip(tooltip) function setExperienceTooltip(tooltip)
experienceTooltip = tooltip experienceTooltip = tooltip
local localPlayer = g_game.getLocalPlayer()
if localPlayer then
experienceBar:setTooltip(tr(experienceTooltip, localPlayer:getLevelPercent(), localPlayer:getLevel()+1))
end
end end

View File

@ -67,7 +67,7 @@ MiniWindow
icon: /images/topbuttons/healthinfo icon: /images/topbuttons/healthinfo
id: healthInfoWindow id: healthInfoWindow
!text: tr('Health Info') !text: tr('Health Info')
height: 124 height: 123
@onClose: modules.game_healthinfo.onMiniWindowClose() @onClose: modules.game_healthinfo.onMiniWindowClose()
&save: true &save: true

View File

@ -210,7 +210,7 @@ int Item::getSubType()
{ {
if(isSplash() || isFluidContainer()) if(isSplash() || isFluidContainer())
return m_countOrSubType; return m_countOrSubType;
if(g_game.getProtocolVersion() >= 860) if(g_game.getProtocolVersion() > 862)
return 0; return 0;
return 1; return 1;
} }