diff --git a/modules/core_widgets/uitabbar.lua b/modules/core_widgets/uitabbar.lua index abfcf27a..eba0cfe3 100644 --- a/modules/core_widgets/uitabbar.lua +++ b/modules/core_widgets/uitabbar.lua @@ -6,10 +6,9 @@ local function onTabClick(tabButton) end local function tabBlink(tabButton) - if tabButton.blinking then - tabButton:setOn(not tabButton:isOn()) - scheduleEvent(function() tabBlink(tabButton) end, 300) - end + if not tabButton.blinking then return end + tabButton:setOn(not tabButton:isOn()) + scheduleEvent(function() tabBlink(tabButton) end, 500) end -- public functions @@ -66,11 +65,9 @@ function UITabBar:selectTab(tabButton) end function UITabBar:blinkTab(tabButton) - if not tabButton:isChecked() then - tabButton:setOn(true) - tabButton.blinking = true - tabBlink(tabButton) - end + if tabButton:isChecked() or tabButton.blinking then return end + tabButton.blinking = true + tabBlink(tabButton) end function UITabBar:getTabPanel(tabButton) diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua index e423d681..8f734e42 100644 --- a/modules/game_console/console.lua +++ b/modules/game_console/console.lua @@ -74,8 +74,7 @@ local function onCreatureSpeak(name, level, speaktypedesc, message, channelId, c end end - local channelPanel = consoleTabBar:getTabPanel(defaultChannelTab) - Console.addText(message, speaktype.color, channelPanel) + Console.addText(message, speaktype.color, defaultChannelTab) end connect(Game, { onLogin = Console.create, diff --git a/src/framework/ui/uigridlayout.cpp b/src/framework/ui/uigridlayout.cpp index bf984113..c5779927 100644 --- a/src/framework/ui/uigridlayout.cpp +++ b/src/framework/ui/uigridlayout.cpp @@ -75,8 +75,8 @@ void UIGridLayout::internalUpdate() if(!widget->isExplicitlyVisible()) continue; - int line = index / m_numLines; - int column = index % m_numLines; + int line = index / m_numColumns; + int column = index % m_numColumns; Point virtualPos = Point(column * (m_cellSize.width() + m_cellSpacing), line * (m_cellSize.height() + m_cellSpacing)); Point pos = topLeft + virtualPos; diff --git a/src/otclient/luafunctions.cpp b/src/otclient/luafunctions.cpp index 4a7037e0..daf57e0e 100644 --- a/src/otclient/luafunctions.cpp +++ b/src/otclient/luafunctions.cpp @@ -129,6 +129,7 @@ void OTClient::registerLuaFunctions() g_lua.bindClassMemberFunction("setSkullTexture", &Creature::setSkullTexture); g_lua.bindClassMemberFunction("setShieldTexture", &Creature::setShieldTexture); g_lua.bindClassMemberFunction("setEmblemTexture", &Creature::setEmblemTexture); + g_lua.bindClassMemberFunction("asMonster", &Creature::asMonster); g_lua.registerClass(); g_lua.bindClassStaticFunction("create", &Item::create);