[Scummvm-cvs-logs] SF.net SVN: scummvm:[35958] scummvm/trunk/engines/tinsel
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Jan 20 18:30:23 CET 2009
Revision: 35958
http://scummvm.svn.sourceforge.net/scummvm/?rev=35958&view=rev
Author: thebluegr
Date: 2009-01-20 17:30:23 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
Implemented loading from the command line and the GMM for tinsel (kSupportsLoadingDuringStartup)
Modified Paths:
--------------
scummvm/trunk/engines/tinsel/detection.cpp
scummvm/trunk/engines/tinsel/tinsel.cpp
Modified: scummvm/trunk/engines/tinsel/detection.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/detection.cpp 2009-01-20 16:13:08 UTC (rev 35957)
+++ scummvm/trunk/engines/tinsel/detection.cpp 2009-01-20 17:30:23 UTC (rev 35958)
@@ -463,10 +463,7 @@
bool TinselMetaEngine::hasFeature(MetaEngineFeature f) const {
return
(f == kSupportsListSaves) ||
- // TODO: See tinsel.cpp ll 994-1005
-#if 0
(f == kSupportsLoadingDuringStartup) ||
-#endif
(f == kSupportsDeleteSave);
}
Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp 2009-01-20 16:13:08 UTC (rev 35957)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp 2009-01-20 17:30:23 UTC (rev 35958)
@@ -509,8 +509,17 @@
if (!bCuttingScene && TinselV2)
WrapScene();
+ // If we're loading from the GMM, load the scene as a delayed one
+ if (loadingFromGMM) {
+ DelayedScene.scene = scene;
+ DelayedScene.entry = entrance;
+ DelayedScene.trans = transition;
+ loadingFromGMM = false;
+ return;
+ }
+
// If CD change will be required, stick in the scene change scene
- if (CdNumber(scene) != GetCurrentCD() || loadingFromGMM) {
+ if (CdNumber(scene) != GetCurrentCD()) {
// This scene gets delayed
DelayedScene.scene = scene;
DelayedScene.entry = entrance;
@@ -520,7 +529,6 @@
NextScene.entry = CdNumber(scene) - '0';
NextScene.trans = TRANS_FADE;
- loadingFromGMM = false;
return;
}
@@ -998,16 +1006,11 @@
//
// TODO: We might want to think about taking care of possible errors
// when loading the save state.
- //
- // TODO: This works fine when loading saves, which require a CD change
- // 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
// Foreground loop
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