Some fixes in entergame and widget clipping

This commit is contained in:
Eduardo Bart
2013-01-22 19:48:25 -02:00
parent ca4caf7991
commit 27d5506262
5 changed files with 16 additions and 9 deletions

View File

@@ -261,11 +261,10 @@ function CharacterList.destroy()
end
function CharacterList.show()
if not loadBox and not errorBox and charactersWindow then
charactersWindow:show()
charactersWindow:raise()
charactersWindow:focus()
end
if loadBox or errorBox or not charactersWindow then return end
charactersWindow:show()
charactersWindow:raise()
charactersWindow:focus()
end
function CharacterList.hide(showLogin)

View File

@@ -147,6 +147,7 @@ function EnterGame.terminate()
end
function EnterGame.show()
if loadBox then return end
enterGame:show()
enterGame:raise()
enterGame:focus()
@@ -159,7 +160,7 @@ end
function EnterGame.openWindow()
if g_game.isOnline() then
CharacterList.show()
elseif not CharacterList.isVisible() then
elseif not g_game.isLogging() and not CharacterList.isVisible() then
EnterGame.show()
end
end
@@ -223,6 +224,7 @@ end
function EnterGame.displayMotd()
if not motdWindow or not motdWindow:isVisible() then
motdWindow = displayInfoBox(tr('Message of the day'), G.motdMessage)
motdWindow.onOk = function() motdWindow = nil end
end
end