[Scummvm-cvs-logs] scummvm master -> 105c90b9d50605bc925c2d6c0cb9ed6658c3acef

Kirben kirben at optusnet.com.au
Sat Nov 19 07:05:51 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
105c90b9d5 AGOS: Fix using saved games from the CD versions of Simon the Sorcerer 2, on the floppy disk versions of Simon the Sorce


Commit: 105c90b9d50605bc925c2d6c0cb9ed6658c3acef
    https://github.com/scummvm/scummvm/commit/105c90b9d50605bc925c2d6c0cb9ed6658c3acef
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-11-18T22:05:23-08:00

Commit Message:
AGOS: Fix using saved games from the CD versions of Simon the Sorcerer 2, on the floppy disk versions of Simon the Sorcerer 2.

Changed paths:
    engines/agos/saveload.cpp



diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 6779eab..920dbb0 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -1390,6 +1390,15 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) {
 
 	_videoLockOut &= ~0x100;
 
+	// The floppy disk versions of Simon the Sorcerer 2 block changing
+	// to scrolling rooms, if the copy protection fails. But the copy
+	// protection flags are never set in the CD version.
+	// Setting this copy protection flag, allows saved games to be shared 
+	// between all versions of Simon the Sorcerer 2.
+	if (getGameType() == GType_SIMON2) {
+		setBitFlag(135, 1);
+	}
+
 	return true;
 }
 






More information about the Scummvm-git-logs mailing list