diff --git a/modules/core/constants.lua b/modules/core/constants.lua index e5654526..4439ba3a 100644 --- a/modules/core/constants.lua +++ b/modules/core/constants.lua @@ -13,4 +13,6 @@ LogWarning = 2 LogError = 3 LogFatal = 4 +ActiveFocusReason = 2 + EmptyFunction = function() end \ No newline at end of file diff --git a/modules/mainmenu/entergame.lua b/modules/mainmenu/entergame.lua index 797ff0d0..2723a64c 100644 --- a/modules/mainmenu/entergame.lua +++ b/modules/mainmenu/entergame.lua @@ -6,6 +6,7 @@ function EnterGame_characterWindow_okClicked() local selected = charactersWindow:getChildById('charactersList'):getFocusedChild() if selected then Game.loginWorld(account, password, selected.worldHost, selected.worldPort, selected.characterName) + Configs.set('lastUsedCharacter', selected.characterName) charactersWindow:destroy() mainMenu:hide() else @@ -24,6 +25,7 @@ local function createCharactersWindow(characters, premDays) local charactersWindow = UI.loadAndDisplayLocked('/mainmenu/ui/charlist.otui') local charactersList = charactersWindow:getChildById('charactersList') local accountStatusLabel = charactersWindow:getChildById('accountStatusLabel') + for i,characterInfo in ipairs(characters) do local characterName = characterInfo[1] local worldName = characterInfo[2] @@ -37,6 +39,10 @@ local function createCharactersWindow(characters, premDays) label.characterName = characterName label.worldHost = worldHost label.worldPort = worldIp + + if i == 0 or Configs.get('lastUsedCharacter') == characterName then + charactersList:focusChild(label, ActiveFocusReason) + end end if premDays > 0 then accountStatusLabel:setText("Account Status:\nPremium Account (" .. premDays .. ' days left)') diff --git a/src/framework/core/logger.h b/src/framework/core/logger.h index fb229cf7..e5bf329c 100644 --- a/src/framework/core/logger.h +++ b/src/framework/core/logger.h @@ -2,6 +2,7 @@ #define LOGGER_H #include "../util/tools.h" +#include "../const.h" #include #include diff --git a/src/framework/graphics/animatedtexture.cpp b/src/framework/graphics/animatedtexture.cpp index 8d9db9a0..93519ea3 100644 --- a/src/framework/graphics/animatedtexture.cpp +++ b/src/framework/graphics/animatedtexture.cpp @@ -22,14 +22,12 @@ AnimatedTexture::AnimatedTexture(int width, int height, int channels, int numFra m_framesTextureId[i] = id; m_framesDelay[i] = framesDelay[i]; } - m_currentFrame = -1; g_dispatcher.scheduleEvent(std::bind(&AnimatedTexture::processAnimation, this), 0); } AnimatedTexture::~AnimatedTexture() { - assert(!g_graphics.isDrawing()); glDeleteTextures(m_numFrames, &m_framesTextureId[0]); m_textureId = 0; } @@ -49,7 +47,10 @@ void AnimatedTexture::processAnimation() if(m_currentFrame >= m_numFrames) m_currentFrame = 0; m_textureId = m_framesTextureId[m_currentFrame]; - AnimatedTexturePtr me = std::static_pointer_cast(shared_from_this()); - if(me.use_count() > 1) - g_dispatcher.addEvent(std::bind(&AnimatedTexture::processAnimation, me), m_framesDelay[m_currentFrame]); + + AnimatedTexturePtr self = asAnimatedTexture(); + + // continue to animate only if something still referencing this texture + if(self.use_count() > 1) + g_dispatcher.scheduleEvent(std::bind(&AnimatedTexture::processAnimation, self), m_framesDelay[m_currentFrame]); } diff --git a/src/framework/graphics/animatedtexture.h b/src/framework/graphics/animatedtexture.h index 29bf7aad..5b2f13eb 100644 --- a/src/framework/graphics/animatedtexture.h +++ b/src/framework/graphics/animatedtexture.h @@ -12,6 +12,8 @@ public: void enableBilinearFilter(); void processAnimation(); + AnimatedTexturePtr asAnimatedTexture() { return std::static_pointer_cast(shared_from_this()); } + private: std::vector m_framesTextureId; std::vector m_framesDelay; @@ -20,7 +22,4 @@ private: int m_lastAnimCheckTicks; }; -typedef std::shared_ptr AnimatedTexturePtr; -typedef std::weak_ptr AnimatedTextureWeakPtr; - #endif diff --git a/src/framework/graphics/declarations.h b/src/framework/graphics/declarations.h index ede66004..af5a9e71 100644 --- a/src/framework/graphics/declarations.h +++ b/src/framework/graphics/declarations.h @@ -4,6 +4,7 @@ #include class Texture; +class AnimatedTexture; class Font; class Image; class BorderImage; @@ -12,6 +13,7 @@ class FrameBuffer; typedef std::weak_ptr TextureWeakPtr; typedef std::shared_ptr TexturePtr; +typedef std::shared_ptr AnimatedTexturePtr; typedef std::shared_ptr FontPtr; typedef std::shared_ptr ImagePtr; typedef std::shared_ptr BorderImagePtr; diff --git a/src/framework/luascript/luabinder.h b/src/framework/luascript/luabinder.h index 89e137fe..2df92066 100644 --- a/src/framework/luascript/luabinder.h +++ b/src/framework/luascript/luabinder.h @@ -5,11 +5,11 @@ #include "luainterface.h" #include "luaexception.h" -/// This namespace contains some dirty metaprogamming with C++0x features +/// This namespace contains some dirty metaprogamming that uses a lot of C++0x features /// The purpose here is to create templates that can bind any function from C++ /// and expose in lua environment. This is done combining variadic templates, /// lambdas, tuples and some type traits features from the new C++0x standard to create -/// templates that can detect functions arguments to generate a lambdas. These lambdas +/// templates that can detect functions's arguments and then generate lambdas. These lambdas /// pops arguments from lua stack, call the bound C++ function and then /// pushes the result to lua. namespace luabinder diff --git a/src/framework/luascript/luafunctions.cpp b/src/framework/luascript/luafunctions.cpp index 39f52415..cbb91936 100644 --- a/src/framework/luascript/luafunctions.cpp +++ b/src/framework/luascript/luafunctions.cpp @@ -46,6 +46,7 @@ void LuaInterface::registerFunctions() g_lua.bindClassMemberFunction("insertChild", &UIWidget::insertChild); g_lua.bindClassMemberFunction("removeChild", &UIWidget::removeChild); g_lua.bindClassMemberFunction("addChild", &UIWidget::addChild); + g_lua.bindClassMemberFunction("focusChild", &UIWidget::focusChild); g_lua.bindClassMemberFunction("lockChild", &UIWidget::lockChild); g_lua.bindClassMemberFunction("updateLayout", &UIWidget::updateLayout); g_lua.bindClassMemberFunction("updateParentLayout", &UIWidget::updateParentLayout);