[Scummvm-cvs-logs] SF.net SVN: scummvm:[42903] scummvm/branches/branch-1-0-0/engines/scumm/ saveload.cpp

[lordhoto at users.sourceforge.net]

Revision: 42903
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42903&view=rev
Author:   lordhoto
Date:     2009-07-29 19:41:52 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Backport of r42900: Fix regression, which prevented saving in COMI.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/scumm/saveload.cpp

Modified: scummvm/branches/branch-1-0-0/engines/scumm/saveload.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/saveload.cpp	2009-07-29 19:41:30 UTC (rev 42902)
+++ scummvm/branches/branch-1-0-0/engines/scumm/saveload.cpp	2009-07-29 19:41:52 UTC (rev 42903)
@@ -92,6 +92,13 @@
 	if (_game.heversion >= 60)
 		return false;
 
+	// COMI always disables saving/loading (to tell the truth:
+	// the main menu) via its scripts, thus we need to make an
+	// exception here. This the same forced overwriting of the
+	// script decisions as in ScummEngine::processKeyboard.
+	if (_game.id == GID_CMI)
+		return true;
+
 	return (VAR_MAINMENU_KEY == 0xFF || VAR(VAR_MAINMENU_KEY) != 0);
 }
 
@@ -111,6 +118,13 @@
 	if (_game.heversion >= 60)
 		return false;
 
+	// COMI always disables saving/loading (to tell the truth:
+	// the main menu) via its scripts, thus we need to make an
+	// exception here. This the same forced overwriting of the
+	// script decisions as in ScummEngine::processKeyboard.
+	if (_game.id == GID_CMI)
+		return true;
+
 	// SCUMM v4+ doesn't allow saving in room 0 or if  
 	// VAR(VAR_MAINMENU_KEY) to set to zero.
 	return (VAR_MAINMENU_KEY == 0xFF || (VAR(VAR_MAINMENU_KEY) != 0 && _currentRoom != 0));


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