[Scummvm-git-logs] scummvm master -> 0603d7f5a7820d35d53d4216ecfdd520eeea6795

[djsrv]

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:
49122e135b DIRECTOR: Set default palette based on platform
0603d7f5a7 DIRECTOR: Exit transition early if user quits


Commit: 49122e135ba41e10bd9c6d4fa110e5f8b07f8ea8
    https://github.com/scummvm/scummvm/commit/49122e135ba41e10bd9c6d4fa110e5f8b07f8ea8
Author: djsrv (dservilla at gmail.com)
Date: 2021-08-13T00:12:41-04:00

Commit Message:
DIRECTOR: Set default palette based on platform

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 28b086b341..c17969912d 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -173,7 +173,7 @@ Common::Error DirectorEngine::run() {
 	_wm->setScreen(_surface);
 	_wm->addWindowInitialized(_stage);
 	_wm->setActiveWindow(_stage->getId());
-	setPalette(-1);
+	setPalette((getPlatform() == Common::kPlatformWindows) ? kClutSystemWin : kClutSystemMac);
 
 	_currentWindow = _stage;
 


Commit: 0603d7f5a7820d35d53d4216ecfdd520eeea6795
    https://github.com/scummvm/scummvm/commit/0603d7f5a7820d35d53d4216ecfdd520eeea6795
Author: djsrv (dservilla at gmail.com)
Date: 2021-08-13T00:12:41-04:00

Commit Message:
DIRECTOR: Exit transition early if user quits

Changed paths:
    engines/director/events.cpp


diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 673169e3d2..3d4f5a3fcb 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -66,6 +66,8 @@ bool DirectorEngine::processEvents(bool captureClick) {
 		switch (event.type) {
 		case Common::EVENT_QUIT:
 			_stage->getCurrentMovie()->getScore()->_playState = kPlayStopped;
+			if (captureClick)
+				return true;
 			break;
 		case Common::EVENT_LBUTTONDOWN:
 			if (captureClick)