[Scummvm-cvs-logs] scummvm master -> 3d0f255912e8440de9e6e4098f7303457f48918b

[cyxx]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ac7c153315 NEWS: mention Tucker fixes
3d0f255912 TUCKER: add missing code for kSupportsLoadingDuringStartup


Commit: ac7c1533151372503f33e396eae6175903f7c4e9
    https://github.com/scummvm/scummvm/commit/ac7c1533151372503f33e396eae6175903f7c4e9
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-03-20T09:44:45-07:00

Commit Message:
NEWS: mention Tucker fixes

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index 8ec174f..9a96d34 100644
--- a/NEWS
+++ b/NEWS
@@ -102,6 +102,9 @@ For a more comprehensive changelog of the latest experimental code, see:
  Touche:
    - Corrected memory leaks and minor issues.
 
+ Tucker:
+   - Added workarounds for several issues present in the original game.
+
  SDL ports:
    - Added support for OpenGL. (GSoC Task)
    - Closed memory leaks in Mouse Surfaces.


Commit: 3d0f255912e8440de9e6e4098f7303457f48918b
    https://github.com/scummvm/scummvm/commit/3d0f255912e8440de9e6e4098f7303457f48918b
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-03-20T10:31:18-07:00

Commit Message:
TUCKER: add missing code for kSupportsLoadingDuringStartup

Changed paths:
    engines/tucker/detection.cpp
    engines/tucker/tucker.cpp



diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp
index f0437d2..7404abc 100644
--- a/engines/tucker/detection.cpp
+++ b/engines/tucker/detection.cpp
@@ -122,8 +122,8 @@ static const ADParams detectionParams = {
 	0,
 	// Flags
 	0,
-	// Additional GUI options (for every game}
-	Common::GUIO_NOLAUNCHLOAD,
+	// Additional GUI options (for every game)
+	Common::GUIO_NONE,
 	// Maximum directory depth
 	1,
 	// List of directory globs
@@ -156,6 +156,7 @@ public:
 	virtual bool hasFeature(MetaEngineFeature f) const {
 		switch (f) {
 		case kSupportsListSaves:
+		case kSupportsLoadingDuringStartup:
 		case kSupportsDeleteSave:
 			return true;
 		default:
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index d3a6b41..e41cbfb 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -124,10 +124,7 @@ void TuckerEngine::restart() {
 	_timerCounter2 = 0;
 	_partNum = _currentPartNum = 0;
 	_locationNum = 0;
-	_nextLocationNum = ConfMan.getInt("boot_param");
-	if (_nextLocationNum == 0) {
-		_nextLocationNum = (_gameFlags & kGameFlagDemo) == 0 ? kStartupLocationGame : kStartupLocationDemo;
-	}
+	_nextLocationNum = (_gameFlags & kGameFlagDemo) == 0 ? kStartupLocationGame : kStartupLocationDemo;
 	_gamePaused = false;
 	_gameDebug = false;
 	_displayGameHints = false;
@@ -353,6 +350,15 @@ void TuckerEngine::mainLoop() {
 
 	_spriteAnimationFrameIndex =  _spriteAnimationsTable[14].firstFrameIndex;
 
+	if (ConfMan.hasKey("save_slot")) {
+		const int slot = ConfMan.getInt("save_slot");
+		if (slot >= 0 && slot <= kLastSaveSlot) {
+			loadGameState(slot);
+		}
+	} else if (ConfMan.hasKey("boot_param")) {
+		_nextLocationNum = ConfMan.getInt("boot_param");
+	}
+
 	do {
 		++_syncCounter;
 		if (_flagsTable[137] != _flagsTable[138]) {