From 2eb1a62a96ef19f776fea4067973f501138be621 Mon Sep 17 00:00:00 2001
From: Johannes Schickel <lordhoto@scummvm.org>
Date: Wed, 29 Jul 2009 15:31:23 +0000
Subject: [PATCH] Fix saving of item in hand in HoF and MR.

svn-id: r42892
---
 engines/kyra/gui_hof.cpp | 2 +-
 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 69e74197571..cb2476ff999 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 e7001ed31f3..858e3fde94d 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) {