Merge pull request #437 from diath/patch-hotkeys

Update hotkeys behavior
This commit is contained in:
Eduardo Bart 2014-01-14 18:16:54 -08:00
commit a8f540cf29
1 changed files with 12 additions and 1 deletions

View File

@ -401,7 +401,18 @@ function doKeyCombo(keyCombo)
end end
elseif hotKey.useType == HOTKEY_MANAGER_USEONTARGET then elseif hotKey.useType == HOTKEY_MANAGER_USEONTARGET then
local attackingCreature = g_game.getAttackingCreature() local attackingCreature = g_game.getAttackingCreature()
if not attackingCreature then return end if not attackingCreature then
local item = Item.create(hotKey.itemId)
if g_game.getProtocolVersion() < 780 or hotKey.subType then
local tmpItem = g_game.findPlayerItem(hotKey.itemId, hotKey.subType or -1)
if not tmpItem then return end
item = tmpItem
end
modules.game_interface.startUseWith(item)
return
end
if not attackingCreature:getTile() then return end if not attackingCreature:getTile() then return end
if g_game.getProtocolVersion() < 780 or hotKey.subType then if g_game.getProtocolVersion() < 780 or hotKey.subType then
local item = g_game.findPlayerItem(hotKey.itemId, hotKey.subType or -1) local item = g_game.findPlayerItem(hotKey.itemId, hotKey.subType or -1)