gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes and preparations for battle window

This commit is contained in:
AndreFaramir 2012-02-08 06:12:46 -02:00
parent 9bff1aa6ea
commit aff8c7717e
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/game_hotkeys/hotkeys_manager.lua
View File

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

2
modules/game_hotkeys/hotkeys_manager.otmod
View File

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

2
src/otclient/luafunctions.cpp
View File

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