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

Added enter / escape button to minimap flag window

This commit is contained in:
Sam 2013-11-18 20:57:50 +01:00
parent fc54a6e418
commit 4f9f04206d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/gamelib/ui/uiminimap.lua
View File

@ -273,11 +273,20 @@ function UIMinimap:createFlagWindow(pos)
flagRadioGroup:selectWidget(flagRadioGroup:getFirstWidget()) flagRadioGroup:selectWidget(flagRadioGroup:getFirstWidget())
okButton.onClick = function() local successFunc = function()
self:addFlag(pos, flagRadioGroup:getSelectedWidget().icon, description:getText()) self:addFlag(pos, flagRadioGroup:getSelectedWidget().icon, description:getText())
self:destroyFlagWindow() self:destroyFlagWindow()
end end
cancelButton.onClick = function() self:destroyFlagWindow() end
local cancelFunc = function()
self:destroyFlagWindow()
end
okButton.onClick = successFunc
cancelButton.onClick = cancelFunc
self.flagWindow.onEnter = successFunc
self.flagWindow.onEscape = cancelFunc
self.flagWindow.onDestroy = function() flagRadioGroup:destroy() end self.flagWindow.onDestroy = function() flagRadioGroup:destroy() end
end end

2
src/client/game.cpp
View File

@ -1356,7 +1356,6 @@ void Game::mount(bool mount)
{ {
if(!canPerformGameAction()) if(!canPerformGameAction())
return; return;
m_protocolGame->sendMountStatus(mount); m_protocolGame->sendMountStatus(mount);
} }
@ -1371,7 +1370,6 @@ void Game::answerModalDialog(int dialog, int button, int choice)
{ {
if(!canPerformGameAction()) if(!canPerformGameAction())
return; return;
m_protocolGame->sendAnswerModalDialog(dialog, button, choice); m_protocolGame->sendAnswerModalDialog(dialog, button, choice);
} }