diff options
author | Florian Kagerer | 2009-06-15 20:52:09 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-06-15 20:52:09 +0000 |
commit | 583a89be627f300488ea12d8c96c699ff2c684f4 (patch) | |
tree | d37fe5ac9885ce937b827c19a0b715ed423f7f3b /engines/kyra/gui_mr.cpp | |
parent | f2e3ddf72a91f1b4857a74b4c6ee228aa5d6d0d8 (diff) | |
download | scummvm-rg350-583a89be627f300488ea12d8c96c699ff2c684f4.tar.gz scummvm-rg350-583a89be627f300488ea12d8c96c699ff2c684f4.tar.bz2 scummvm-rg350-583a89be627f300488ea12d8c96c699ff2c684f4.zip |
LOL: - started on the ingame menu code (death menu, load menu and main menu)
- fixed regression in kyra gui code (broken menu highlighting)
- fixed minor bug in animation code
svn-id: r41557
Diffstat (limited to 'engines/kyra/gui_mr.cpp')
-rw-r--r-- | engines/kyra/gui_mr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp index d2ba783b2f..4340cf793c 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -1269,7 +1269,7 @@ int GUI_MR::optionsButton(Button *button) { } while (_displayMenu) { - processHighlights(*_currentMenu, _vm->_mouseX, _vm->_mouseY); + processHighlights(*_currentMenu); getInput(); } @@ -1312,7 +1312,7 @@ int GUI_MR::loadMenu(Button *caller) { _screen->updateScreen(); while (_isLoadMenu) { - processHighlights(_loadMenu, _vm->_mouseX, _vm->_mouseY); + processHighlights(_loadMenu); getInput(); } @@ -1362,7 +1362,7 @@ int GUI_MR::gameOptions(Button *caller) { _isOptionsMenu = true; while (_isOptionsMenu) { - processHighlights(_gameOptions, _vm->_mouseX, _vm->_mouseY); + processHighlights(_gameOptions); getInput(); } @@ -1525,7 +1525,7 @@ int GUI_MR::audioOptions(Button *caller) { updateAllMenuButtons(); bool speechEnabled = _vm->speechEnabled(); while (_isOptionsMenu) { - processHighlights(_audioOptions, _vm->_mouseX, _vm->_mouseY); + processHighlights(_audioOptions); getInput(); } |