[Scummvm-cvs-logs] SF.net SVN: scummvm:[42893] scummvm/branches/branch-1-0-0/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Wed Jul 29 17:33:38 CEST 2009


Revision: 42893
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42893&view=rev
Author:   lordhoto
Date:     2009-07-29 15:33:38 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Backport of r42892: Fix saving of item in hand in HoF and MR.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/kyra/gui_hof.cpp
    scummvm/branches/branch-1-0-0/engines/kyra/gui_mr.cpp

Modified: scummvm/branches/branch-1-0-0/engines/kyra/gui_hof.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/gui_hof.cpp	2009-07-29 15:31:23 UTC (rev 42892)
+++ scummvm/branches/branch-1-0-0/engines/kyra/gui_hof.cpp	2009-07-29 15:33:38 UTC (rev 42893)
@@ -757,7 +757,6 @@
 	initMenu(*_currentMenu);
 	_madeSave = false;
 	_loadedSave = false;
-	_vm->_itemInHand = -1;
 	updateAllMenuButtons();
 
 	if (_isDeathMenu) {
@@ -821,6 +820,7 @@
 	_vm->setNextIdleAnimTimer();
 	_isDeathMenu = false;
 	if (!_loadedSave) {
+		_vm->_itemInHand = -1;
 		_vm->setHandItem(item);
 	} else {
 		_vm->setHandItem(_vm->_itemInHand);

Modified: scummvm/branches/branch-1-0-0/engines/kyra/gui_mr.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/gui_mr.cpp	2009-07-29 15:31:23 UTC (rev 42892)
+++ scummvm/branches/branch-1-0-0/engines/kyra/gui_mr.cpp	2009-07-29 15:33:38 UTC (rev 42893)
@@ -1141,6 +1141,7 @@
 	_vm->setNextIdleAnimTimer();
 	_isDeathMenu = false;
 	if (!_loadedSave) {
+		_vm->_itemInHand = -1;
 		_vm->setHandItem(item);
 	} else {
 		_vm->setHandItem(_vm->_itemInHand);
@@ -1260,7 +1261,6 @@
 	initMenu(*_currentMenu);
 	_madeSave = false;
 	_loadedSave = false;
-	_vm->_itemInHand = -1;
 	updateAllMenuButtons();
 
 	if (_isDeathMenu) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list