[Scummvm-cvs-logs] SF.net SVN: scummvm:[42626] scummvm/trunk/engines/tinsel/saveload.cpp

[dreammaster at users.sourceforge.net]

Revision: 42626
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42626&view=rev
Author:   dreammaster
Date:     2009-07-20 09:19:27 +0000 (Mon, 20 Jul 2009)

Log Message:
-----------
Bugfix for hangs on scene changes in Discworld 1 after having loaded a savegame from the GMM when the title screens are displayed

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/saveload.cpp

Modified: scummvm/trunk/engines/tinsel/saveload.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/saveload.cpp	2009-07-20 08:31:40 UTC (rev 42625)
+++ scummvm/trunk/engines/tinsel/saveload.cpp	2009-07-20 09:19:27 UTC (rev 42626)
@@ -84,6 +84,8 @@
 // in POLYGONS.C
 extern void syncPolyInfo(Common::Serializer &s);
 
+extern int sceneCtr;
+
 //----------------- LOCAL DEFINES --------------------
 
 struct SaveGameHeader {
@@ -510,6 +512,10 @@
 void ProcessSRQueue(void) {
 	switch (SRstate) {
 	case SR_DORESTORE:
+		// If a load has been done directly from title screens, set a larger value for scene ctr so the
+		// code used to skip the title screens in Discworld 1 gets properly disabled
+		if (sceneCtr < 10) sceneCtr = 10;
+
 		if (DoRestore()) {
 			DoRestoreScene(srsd, false);
 		}


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