[Scummvm-git-logs] scummvm master -> bab6f4bcd5c46876ef70e971f3e0a2867e0d921d

[rvanlaar]

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:
0ec237b467 JANITORIAL: Remove old comment
bab6f4bcd5 DIRECTOR: LINGO: improve saveMovie


Commit: 0ec237b4671a96d2ef6cf597496bcbc01389ba2c
    https://github.com/scummvm/scummvm/commit/0ec237b4671a96d2ef6cf597496bcbc01389ba2c
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-03-14T21:28:32+01:00

Commit Message:
JANITORIAL: Remove old comment

Changed paths:
    engines/director/lingo/lingo-bytecode.cpp


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 5ab06276a84..2af5e8efd99 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -595,7 +595,6 @@ void LC::cb_theassign() {
 void LC::cb_theassign2() {
 	// cb_theassign2 is for setting movie-level properties
 
-	// only seen in louis catorze with searchPath
 	Common::String name = g_lingo->readString();
 	Datum value = g_lingo->pop();
 


Commit: bab6f4bcd5c46876ef70e971f3e0a2867e0d921d
    https://github.com/scummvm/scummvm/commit/bab6f4bcd5c46876ef70e971f3e0a2867e0d921d
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-03-14T21:42:26+01:00

Commit Message:
DIRECTOR: LINGO: improve saveMovie

The property saveMovieEnabled is set when a movie needs to be saved when
branching out from said movie.

Changes:
- saveMovie can have an optional filepath: set minArgs to 0
- call saveMovie when updateMovieEnabled is set and another movie is
  opened

Changed paths:
    engines/director/lingo/lingo-builtins.cpp
    engines/director/lingo/lingo-funcs.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 5be29118c47..dd5370e8392 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -106,7 +106,7 @@ static BuiltinProto builtins[] = {
 	{ "openDA",	 		LB::b_openDA, 		1, 1, 200, CBLTIN },	// D2 c
 	{ "openResFile",	LB::b_openResFile,	1, 1, 200, CBLTIN },	// D2 c
 	{ "openXlib",		LB::b_openXlib,		1, 1, 200, CBLTIN },	// D2 c
-	{ "saveMovie",		LB::b_saveMovie,	1, 1, 400, CBLTIN },	//			D4 c
+	{ "saveMovie",		LB::b_saveMovie,	0, 1, 400, CBLTIN },	//			D4 c
 	{ "setCallBack",	LB::b_setCallBack,	2, 2, 200, CBLTIN },	// D2 c
 	{ "showResFile",	LB::b_showResFile,	0, 1, 200, CBLTIN },	// D2 c
 	{ "showXlib",		LB::b_showXlib,		0, 1, 200, CBLTIN },	// D2 c
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index c5ef71d41d2..b0b5c2b0a39 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -37,6 +37,7 @@
 #include "director/util.h"
 
 #include "director/lingo/lingo.h"
+#include "director/lingo/lingo-builtins.h"
 
 
 namespace Director {
@@ -206,6 +207,11 @@ void Lingo::func_goto(Datum &frame, Datum &movie) {
 		if (!stage->setNextMovie(movieFilenameRaw))
 			return;
 
+		if (g_lingo->_updateMovieEnabled) {
+			// Save the movie when branching to another movie.
+			LB::b_saveMovie(0);
+		}
+
 		score->_playState = kPlayStopped;
 
 		stage->_nextMovie.frameS.clear();