[Scummvm-git-logs] scummvm master -> 76e66a4be40c0622f22c974b0724e743d113b7fb

sev- sev at scummvm.org
Sat Feb 4 23:32:35 CET 2017


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:
76e66a4be4 DIRECTOR: Lingo: Implemented b_quit()


Commit: 76e66a4be40c0622f22c974b0724e743d113b7fb
    https://github.com/scummvm/scummvm/commit/76e66a4be40c0622f22c974b0724e743d113b7fb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-04T23:32:22+01:00

Commit Message:
DIRECTOR: Lingo: Implemented b_quit()

Changed paths:
    engines/director/lingo/lingo-builtins.cpp
    engines/director/score.h


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 3f0f5e4..bb2bdc2 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -755,7 +755,10 @@ void Lingo::b_printFrom(int nargs) {
 }
 
 void Lingo::b_quit(int nargs) {
-	warning("STUB: b_quit");
+	if (g_director->_currentScore)
+		g_director->_currentScore->_stopPlay = true;
+
+	g_lingo->pushVoid();
 }
 
 void Lingo::b_restart(int nargs) {
diff --git a/engines/director/score.h b/engines/director/score.h
index a53c13f..dca1b8f 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -109,6 +109,8 @@ public:
 	Archive *_movieArchive;
 	Common::Rect _movieRect;
 
+	bool _stopPlay;
+
 private:
 	uint16 _versionMinor;
 	uint16 _versionMajor;
@@ -123,7 +125,6 @@ private:
 	Common::String _currentLabel;
 	uint32 _nextFrameTime;
 	uint32 _flags;
-	bool _stopPlay;
 	uint16 _castArrayEnd;
 	uint16 _movieScriptCount;
 	uint16 _stageColor;





More information about the Scummvm-git-logs mailing list