[Scummvm-cvs-logs] SF.net SVN: scummvm:[54869] scummvm/trunk/engines/mohawk/livingbooks.cpp

[fuzzie at users.sourceforge.net]

Revision: 54869
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54869&view=rev
Author:   fuzzie
Date:     2010-12-11 19:53:28 +0000 (Sat, 11 Dec 2010)

Log Message:
-----------
MOHAWK: Add yet more fallbacks for LB page loading

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/livingbooks.cpp

Modified: scummvm/trunk/engines/mohawk/livingbooks.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-12-11 19:53:11 UTC (rev 54868)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-12-11 19:53:28 UTC (rev 54869)
@@ -115,7 +115,7 @@
 	_cursor->setDefaultCursor();
 	_cursor->showCursor();
 
-	if (!loadPage(kLBIntroMode, 1, 0))
+	if (!tryLoadPageStart(kLBIntroMode, 1))
 		error("Could not load intro page");
 
 	Common::Event event;
@@ -1062,9 +1062,11 @@
 			// TODO: what is entry.newUnknown?
 			if (!event.newMode)
 				event.newMode = _curMode;
-			if (!loadPage((LBMode)event.newMode, event.newPage, event.newSubpage))
-				error("kLBNotifyChangeMode failed to move to mode %d, page %d.%d",
-					event.newMode, event.newPage, event.newSubpage);
+			if (!loadPage((LBMode)event.newMode, event.newPage, event.newSubpage)) {
+				if (event.newSubpage != 0 || !loadPage((LBMode)event.newMode, event.newPage, 1))
+					error("kLBNotifyChangeMode failed to move to mode %d, page %d.%d",
+						event.newMode, event.newPage, event.newSubpage);
+			}
 		}
 		break;
 


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