[Scummvm-cvs-logs] SF.net SVN: scummvm:[35932] scummvm/trunk/engines/tinsel
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Jan 20 01:33:27 CET 2009
Revision: 35932
http://scummvm.svn.sourceforge.net/scummvm/?rev=35932&view=rev
Author: thebluegr
Date: 2009-01-20 00:33:26 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
Some WIP code for the kSupportsLoadingDuringStartup engine feature
Modified Paths:
--------------
scummvm/trunk/engines/tinsel/drives.cpp
scummvm/trunk/engines/tinsel/tinsel.cpp
Modified: scummvm/trunk/engines/tinsel/drives.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/drives.cpp 2009-01-20 00:03:35 UTC (rev 35931)
+++ scummvm/trunk/engines/tinsel/drives.cpp 2009-01-20 00:33:26 UTC (rev 35932)
@@ -32,6 +32,7 @@
namespace Tinsel {
+static bool restoringfromGMM = false;
static char currentCD = '1';
static uint32 cdFlags[] = { fCd1, fCd2, fCd3, fCd4, fCd5, fCd6, fCd7, fCd8 };
Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp 2009-01-20 00:03:35 UTC (rev 35931)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp 2009-01-20 00:33:26 UTC (rev 35932)
@@ -104,6 +104,7 @@
bool bRestart = false;
bool bHasRestarted = false;
+bool loadingFromGMM = false;
static bool bCuttingScene = false;
@@ -509,7 +510,7 @@
WrapScene();
// If CD change will be required, stick in the scene change scene
- if (CdNumber(scene) != GetCurrentCD()) {
+ if (CdNumber(scene) != GetCurrentCD() || loadingFromGMM) {
// This scene gets delayed
DelayedScene.scene = scene;
DelayedScene.entry = entrance;
@@ -518,6 +519,8 @@
NextScene.scene = hCdChangeScene;
NextScene.entry = CdNumber(scene) - '0';
NextScene.trans = TRANS_FADE;
+
+ loadingFromGMM = false;
return;
}
@@ -997,10 +1000,12 @@
// when loading the save state.
//
// TODO: This works fine when loading saves, which require a CD change
- // in DW2. For every other save it'll fail though.
+ // in DW2. It will also work for DW1. For every other save it'll fail though.
+
#if 0
if (ConfMan.hasKey("save_slot")) {
loadGameState(ConfMan.getInt("save_slot"));
+ loadingFromGMM = true;
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list