diff options
author | Florian Kagerer | 2009-05-24 14:33:41 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-05-24 14:33:41 +0000 |
commit | 84a2651e63addeb55c61ed6244c77073f8921193 (patch) | |
tree | f38f0793c8a7a53d5f2e4f34c989b68d11c0654e /engines/kyra/kyra_v1.cpp | |
parent | a4b733403a8ebc1acac608c953056eb498d900ba (diff) | |
download | scummvm-rg350-84a2651e63addeb55c61ed6244c77073f8921193.tar.gz scummvm-rg350-84a2651e63addeb55c61ed6244c77073f8921193.tar.bz2 scummvm-rg350-84a2651e63addeb55c61ed6244c77073f8921193.zip |
LOL: fixed some input code issues:
- party would move 2 steps instead of one when using keyboad while magic menu was open
- viewing notes would abort at once instead of waiting for the next click
svn-id: r40863
Diffstat (limited to 'engines/kyra/kyra_v1.cpp')
-rw-r--r-- | engines/kyra/kyra_v1.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 8585b0fced..d642918667 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -224,7 +224,7 @@ void KyraEngine_v1::setMousePos(int x, int y) { _system->warpMouse(x, y); } -int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop) { +int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag) { _isSaveAllowed = mainLoop; updateInput(); _isSaveAllowed = false; @@ -365,7 +365,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop) { GUI *guiInstance = gui(); if (guiInstance) { if (keys) - return guiInstance->processButtonList(buttonList, keys | 0x8000, mouseWheel); + return guiInstance->processButtonList(buttonList, keys | eventFlag, mouseWheel); else return guiInstance->processButtonList(buttonList, 0, mouseWheel); } else { |