fixes and preparations for battle window

master
AndreFaramir 12 years ago
parent 9bff1aa6ea
commit aff8c7717e

@ -68,7 +68,6 @@ end
function HotkeysManager.load()
local hotkeySettings = Settings.getNode('HotkeysManager')
local label
if hotkeySettings ~= nil then
for i, v in pairs(hotkeySettings) do
HotkeysManager.addKeyCombo(nil, v.keyCombo, v)
@ -99,7 +98,7 @@ function HotkeysManager.terminate()
hotkeyLabelSelectedOnList = nil
currentItemPreview = nil
hotkeyList = nil
hotkeyList = {}
addHotkey = nil
removeHotkey = nil
hotkeyText = nil
@ -201,6 +200,7 @@ function HotkeysManager.addHotkey()
local widget
messageBox = createWidget('MainWindow', hotkeysWindow)
messageBox:grabKeyboard()
messageBox:setId('assignWindow')
messageBox:setText('Button Assign')
messageBox:setWidth(420)

@ -8,7 +8,7 @@ Module
- client_tibiafiles
onLoad: |
require 'hotkeys_manager'
dofile 'hotkeys_manager'
HotkeysManager.init()
onUnload: |

@ -118,7 +118,9 @@ void OTClient::registerLuaFunctions()
g_lua.bindClassMemberFunction<Thing>("isFullGround", &Thing::isFullGround);
g_lua.registerClass<Creature, Thing>();
g_lua.bindClassMemberFunction<Creature>("getId", &Creature::getId);
g_lua.bindClassMemberFunction<Creature>("getName", &Creature::getName);
g_lua.bindClassMemberFunction<Creature>("getHealthPercent", &Creature::getHealthPercent);
g_lua.bindClassMemberFunction<Creature>("getShield", &Creature::getShield);
g_lua.bindClassMemberFunction<Creature>("setOutfit", &Creature::setOutfit);
g_lua.bindClassMemberFunction<Creature>("getOutfit", &Creature::getOutfit);

Loading…
Cancel
Save