[Scummvm-git-logs] scummvm master -> 14c92e617925e8c26160826d2c1f841186053471

[sev-]

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:
14c92e6179 DIRECTOR: Extend --start-movie to start at frame


Commit: 14c92e617925e8c26160826d2c1f841186053471
    https://github.com/scummvm/scummvm/commit/14c92e617925e8c26160826d2c1f841186053471
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-07-24T20:57:52+02:00

Commit Message:
DIRECTOR: Extend --start-movie to start at frame

A frame number can be given to --start-movie and it will start
at that frame.
Examples:
    --start-movie=movie.dir at 45  # start movie.dir at frame 45
    --start-movie=@23           # start the default movie frame 23
    --start-movie=movie.dir     # start movie.dir as usual

Changed paths:
    base/commandLine.cpp
    engines/director/detection.cpp
    engines/director/director.h
    engines/director/lingo/lingo.cpp
    engines/director/stage.cpp
    engines/director/stage.h


diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 5be3324e16..c45f860cbf 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -169,7 +169,8 @@ static const char HELP_STRING[] =
 	"  --demo-mode              Start demo mode of Maniac Mansion or The 7th Guest\n"
 #endif
 #if defined(ENABLE_DIRECTOR)
-	"  --start-movie=NAME       Start movie for Director\n"
+	"  --start-movie=NAME at NUM   Start movie at frame for Director\n"
+	"							Either can be specified without the other.\n"
 #endif
 #ifdef ENABLE_SCUMM
 	"  --tempo=NUM              Set music tempo (in percent, 50-200) for SCUMM games\n"
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 3a25ab0e91..18950a95e5 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -59,12 +59,28 @@ Common::Language DirectorEngine::getLanguage() const {
 }
 
 Common::String DirectorEngine::getEXEName() const {
-	if (ConfMan.hasKey("start_movie"))
-		return ConfMan.get("start_movie");
+	StartMovie startMovie = getStartMovie();
+	if (startMovie.startMovie.size() > 0)
+		return startMovie.startMovie;
 
 	return _gameDescription->desc.filesDescriptions[0].fileName;
 }
 
+StartMovie DirectorEngine::getStartMovie() const {
+	StartMovie startMovie;
+	startMovie.startFrame = -1;
+
+	if (ConfMan.hasKey("start_movie")) {
+		Common::String option = ConfMan.get("start_movie");
+		int colonPos = option.findLastOf("@");
+		startMovie.startMovie = option.substr(0, colonPos);
+		Common::String tail = option.substr(colonPos + 1, option.size());
+		if (tail.size() > 0)
+			startMovie.startFrame = atoi(tail.c_str());
+	}
+	return startMovie;
+}
+
 bool DirectorEngine::hasFeature(EngineFeature f) const {
 	return false;
 		//(f == kSupportsReturnToLauncher);
diff --git a/engines/director/director.h b/engines/director/director.h
index 1f1dd367ef..92c9bb45e1 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -96,6 +96,11 @@ struct MovieReference {
 	MovieReference() { frameI = -1; }
 };
 
+struct StartMovie {
+	Common::String startMovie;
+	int16 startFrame;
+};
+
 struct PaletteV4 {
 	int id;
 	byte *palette;
@@ -165,6 +170,7 @@ public:
 	Common::Platform getPlatform() const;
 	Common::Language getLanguage() const;
 	Common::String getEXEName() const;
+	StartMovie getStartMovie() const;
 	DirectorSound *getSoundManager() const { return _soundManager; }
 	Graphics::MacWindowManager *getMacWindowManager() const { return _wm; }
 	Archive *getMainArchive() const;
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 9b390ef678..000a4693d4 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -1090,9 +1090,9 @@ void Lingo::runTests() {
 
 	LingoArchive *mainArchive = g_director->getCurrentMovie()->getMainLingoArch();
 
-	// Repurpose commandline option --start-movie to run a specific lingo script.
-	if (ConfMan.hasKey("start_movie")) {
-		fileList.push_back(ConfMan.get("start_movie"));
+	Common::String startMovie = _vm->getStartMovie().startMovie;
+	if (startMovie.size() > 0) {
+		fileList.push_back(startMovie);
 	} else {
 		for (Common::ArchiveMemberList::iterator it = fsList.begin(); it != fsList.end(); ++it)
 			fileList.push_back((*it)->getName());
diff --git a/engines/director/stage.cpp b/engines/director/stage.cpp
index 62c4bddfd2..75d4c536d1 100644
--- a/engines/director/stage.cpp
+++ b/engines/director/stage.cpp
@@ -54,6 +54,7 @@ Stage::Stage(int id, bool scrollable, bool resizable, bool editable, Graphics::M
 	_newMovieStarted = true;
 
 	_objType = kWindowObj;
+	_startFrame = _vm->getStartMovie().startFrame;
 }
 
 Stage::~Stage() {
@@ -470,6 +471,10 @@ bool Stage::step() {
 				if (!debugChannelSet(-1, kDebugCompileOnly) && goodMovie) {
 					debugC(1, kDebugEvents, "Starting playback of movie '%s'", _currentMovie->getMacName().c_str());
 					_currentMovie->getScore()->startPlay();
+					if (_startFrame != -1) {
+						_currentMovie->getScore()->setCurrentFrame(_startFrame);
+						_startFrame = -1;
+					}
 				} else {
 					return false;
 				}
diff --git a/engines/director/stage.h b/engines/director/stage.h
index 1b8be74c8e..3b02326eca 100644
--- a/engines/director/stage.h
+++ b/engines/director/stage.h
@@ -169,6 +169,7 @@ private:
 	Movie *_currentMovie;
 	Common::String _currentPath;
 	Common::StringArray _movieQueue;
+	int16 _startFrame;
 
 private:
 	int preprocessColor(DirectorPlotData *p, int src);