diff options
| author | Johannes Schickel | 2009-07-29 15:31:23 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-07-29 15:31:23 +0000 |
| commit | 2eb1a62a96ef19f776fea4067973f501138be621 (patch) | |
| tree | 5aa2638b3e87416f9b1b9ac706489359faab5c6e | |
| parent | c6dd192ca6a006caf65ccaf8026d8d89106cf66d (diff) | |
| download | scummvm-rg350-2eb1a62a96ef19f776fea4067973f501138be621.tar.gz scummvm-rg350-2eb1a62a96ef19f776fea4067973f501138be621.tar.bz2 scummvm-rg350-2eb1a62a96ef19f776fea4067973f501138be621.zip | |
Fix saving of item in hand in HoF and MR.
svn-id: r42892
| -rw-r--r-- | engines/kyra/gui_hof.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/gui_mr.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp index 69e7419757..cb2476ff99 100644 --- a/engines/kyra/gui_hof.cpp +++ b/engines/kyra/gui_hof.cpp @@ -757,7 +757,6 @@ int GUI_HoF::optionsButton(Button *button) { initMenu(*_currentMenu); _madeSave = false; _loadedSave = false; - _vm->_itemInHand = -1; updateAllMenuButtons(); if (_isDeathMenu) { @@ -821,6 +820,7 @@ void GUI_HoF::resetState(int item) { _vm->setNextIdleAnimTimer(); _isDeathMenu = false; if (!_loadedSave) { + _vm->_itemInHand = -1; _vm->setHandItem(item); } else { _vm->setHandItem(_vm->_itemInHand); diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp index e7001ed31f..858e3fde94 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -1141,6 +1141,7 @@ void GUI_MR::resetState(int item) { _vm->setNextIdleAnimTimer(); _isDeathMenu = false; if (!_loadedSave) { + _vm->_itemInHand = -1; _vm->setHandItem(item); } else { _vm->setHandItem(_vm->_itemInHand); @@ -1260,7 +1261,6 @@ int GUI_MR::optionsButton(Button *button) { initMenu(*_currentMenu); _madeSave = false; _loadedSave = false; - _vm->_itemInHand = -1; updateAllMenuButtons(); if (_isDeathMenu) { |