[Scummvm-git-logs] scummvm master -> 6de9ff5e421d871575782707a1521515af490ce9

[ysj1173886760]

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:
6de9ff5e42 DIRECTOR: amend function play


Commit: 6de9ff5e421d871575782707a1521515af490ce9
    https://github.com/scummvm/scummvm/commit/6de9ff5e421d871575782707a1521515af490ce9
Author: ysj1173886760 (1173886760 at qq.com)
Date: 2021-07-08T11:05:17+08:00

Commit Message:
DIRECTOR: amend function play

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


diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index 790e9e2ebe..1f61968308 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -284,9 +284,6 @@ void Lingo::func_play(Datum &frame, Datum &movie) {
 		f.type = INT;
 		f.u.i = ref.frameI;
 
-		if (g_lingo->_currentChannelId == 0)
-			f.u.i++;
-
 		func_goto(f, m);
 
 		return;
@@ -299,6 +296,10 @@ void Lingo::func_play(Datum &frame, Datum &movie) {
 
 	ref.frameI = _vm->getCurrentMovie()->getScore()->getCurrentFrame();
 
+	// if we are issuing play command from script channel script. then play done should return to next frame
+	if (g_lingo->_currentChannelId == 0)
+		ref.frameI++;
+
 	stage->_movieStack.push_back(ref);
 
 	func_goto(frame, movie);