[Scummvm-git-logs] scummvm master -> 4b364787863b62f7a141f38646a8772e921fb1e7

[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:
4b36478786 DIRECTOR: Lingo: Clarified 'play' and 'play done' implementations


Commit: 4b364787863b62f7a141f38646a8772e921fb1e7
    https://github.com/scummvm/scummvm/commit/4b364787863b62f7a141f38646a8772e921fb1e7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-24T19:32:40+01:00

Commit Message:
DIRECTOR: Lingo: Clarified 'play' and 'play done' implementations

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 58800f2..f21f01a 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -279,6 +279,12 @@ void Lingo::func_gotoprevious() {
 void Lingo::func_play(Datum &frame, Datum &movie) {
 	MovieReference ref;
 
+	if (movie.type != VOID) {
+		warning("STUB: func_play()");
+
+		return;
+	}
+
 	ref.frameI = _vm->getCurrentScore()->getCurrentFrame();
 
 	_vm->_movieStack.push_back(ref);
@@ -293,8 +299,13 @@ void Lingo::func_playdone() {
 
 	Datum m, f;
 
-	warning("STUB: func_playdone()");
-	m.type = VOID;
+	if (ref.movie.empty()) {
+		m.type = VOID;
+	} else {
+		m.type = STRING;
+		m.u.s = new Common::String(ref.movie);
+	}
+
 	f.type = INT;
 	f.u.i = ref.frameI;