Fix saving of item in hand in HoF and MR.

svn-id: r42892
This commit is contained in:
Johannes Schickel 2009-07-29 15:31:23 +00:00
parent c6dd192ca6
commit 2eb1a62a96
2 changed files with 2 additions and 2 deletions

View File

@ -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);

View File

@ -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) {