[Scummvm-cvs-logs] scummvm master -> ce1e776eeef153ca3aa6beaae5ce3786919368d6

[lukaslw]

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

Summary:
ce1e776eee PRINCE: Add loading during startup and syncSoundSettings features


Commit: ce1e776eeef153ca3aa6beaae5ce3786919368d6
    https://github.com/scummvm/scummvm/commit/ce1e776eeef153ca3aa6beaae5ce3786919368d6
Author: lukaslw (lukaslw at gmail.com)
Date: 2014-11-09T01:42:54+01:00

Commit Message:
PRINCE: Add loading during startup and syncSoundSettings features

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



diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index dd553ad..3fe7993 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -55,7 +55,8 @@ bool PrinceMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSavesSupportMetaInfo) ||
 		(f == kSavesSupportThumbnail) ||
 		(f == kSavesSupportCreationDate) ||
-		(f == kSupportsListSaves);
+		(f == kSupportsListSaves) ||
+		(f == kSupportsLoadingDuringStartup);
 }
 
 bool Prince::PrinceEngine::hasFeature(EngineFeature f) const {
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 6239d6a..5055c6a 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -439,13 +439,16 @@ void PrinceEngine::showLogo() {
 }
 
 Common::Error PrinceEngine::run() {
-
+	syncSoundSettings();
+	int startGameSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
 	init();
-
-	showLogo();
-
+	if (startGameSlot == -1) {
+		showLogo();
+	} else {
+		loadLocation(59); // load intro location - easiest way to set everything up
+		loadGame(startGameSlot);
+	}
 	mainLoop();
-
 	return Common::kNoError;
 }