From b40dc424b3ec2121b6cc62f3648d014f25583256 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 20 Jul 2009 09:19:27 +0000
Subject: Bugfix for hangs on scene changes in Discworld 1 after having loaded
 a savegame from the GMM when the title screens are displayed

svn-id: r42626
---
 engines/tinsel/saveload.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'engines')

diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp
index 62bcc732a8..efa6e0c8a8 100644
--- a/engines/tinsel/saveload.cpp
+++ b/engines/tinsel/saveload.cpp
@@ -84,6 +84,8 @@ extern void syncGlobInfo(Common::Serializer &s);
 // in POLYGONS.C
 extern void syncPolyInfo(Common::Serializer &s);
 
+extern int sceneCtr;
+
 //----------------- LOCAL DEFINES --------------------
 
 struct SaveGameHeader {
@@ -510,6 +512,10 @@ save_failure:
 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);
 		}
-- 
cgit v1.2.3