diff options
author | Johannes Schickel | 2008-05-12 12:42:10 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-05-12 12:42:10 +0000 |
commit | 574af78acb793b23b22f3a47d201d4074387304e (patch) | |
tree | aef2d03d83619faa54c5eac7137f738805b88cf9 /engines/kyra/gui_mr.cpp | |
parent | e8e4c5dafbbc5161030485ddd4e8f077a96f00e2 (diff) | |
download | scummvm-rg350-574af78acb793b23b22f3a47d201d4074387304e.tar.gz scummvm-rg350-574af78acb793b23b22f3a47d201d4074387304e.tar.bz2 scummvm-rg350-574af78acb793b23b22f3a47d201d4074387304e.zip |
- Moved some opcodes to KyraEngine_v1
- Little variable renaming
svn-id: r32053
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 d0a39df0b2..0384b3c138 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -194,7 +194,7 @@ void KyraEngine_MR::showInventory() { _screen->hideMouse(); if (_itemInHand < 0) { - _handItemSet = -1; + _mouseState = -1; _screen->setMouseCursor(0, 0, getShapePtr(0)); } @@ -684,7 +684,7 @@ int KyraEngine_MR::buttonJesterStaff(Button *button) { void KyraEngine_MR::showAlbum() { debugC(9, kDebugLevelMain, "KyraEngine_MR::showAlbum()"); - if (!_screen->isMouseVisible() || queryGameFlag(4) || _handItemSet != -1) + if (!_screen->isMouseVisible() || queryGameFlag(4) || _mouseState != -1) return; if (!loadLanguageFile("ALBUM.", _album.file)) @@ -1262,8 +1262,8 @@ int GUI_MR::optionsButton(Button *button) { _vm->showMessage(0, 0xF0, 0xF0); - if (_vm->_handItemSet < -1) { - _vm->_handItemSet = -1; + if (_vm->_mouseState < -1) { + _vm->_mouseState = -1; _screen->hideMouse(); _screen->setMouseCursor(1, 1, _vm->getShapePtr(0)); _screen->showMouse(); |