More walk control optimization and fixes:

* Finished off the walking control optimization! (Should be smooth controlling now).
* Fixed issue #151
* Fixed an issue with the character list.
* Fixed a bug in the g_keyboard.isKeySetPressed function.
This commit is contained in:
BeniS
2012-12-30 19:14:49 +13:00
parent 1782de7336
commit abf0ee4303
10 changed files with 53 additions and 25 deletions

View File

@@ -231,17 +231,13 @@ function CharacterList.create(characters, account, otui)
end
function CharacterList.destroy()
charactersWindow:hide()
CharacterList.hide(true)
if charactersWindow then
characterList = nil
charactersWindow:destroy()
charactersWindow = nil
end
if EnterGame and not g_game.isOnline() then
EnterGame.show()
end
end
function CharacterList.show()
@@ -252,8 +248,13 @@ function CharacterList.show()
end
end
function CharacterList.hide()
function CharacterList.hide(showLogin)
showLogin = showLogin or false
charactersWindow:hide()
if showLogin and EnterGame and not g_game.isOnline() then
EnterGame.show()
end
end
function CharacterList.showAgain()

View File

@@ -46,7 +46,7 @@ MainWindow
size: 250 248
visible: false
@onEnter: CharacterList.doLogin()
@onEscape: CharacterList.hide()
@onEscape: CharacterList.hide(true)
@onSetup: |
g_keyboard.bindKeyPress('Up', function() self:getChildById('characters'):focusPreviousChild(KeyboardFocusReason) end, self)
g_keyboard.bindKeyPress('Down', function() self:getChildById('characters'):focusNextChild(KeyboardFocusReason) end, self)
@@ -113,4 +113,4 @@ MainWindow
width: 64
anchors.right: parent.right
anchors.bottom: parent.bottom
@onClick: CharacterList.destroy()
@onClick: CharacterList.hide(true)