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

[sev-]

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:
d064d15786 DIRECTOR: Do not draw empty desktop on movie transitions
d04c5c86d1 DIRECTOR: Disable desktop for Director for the time being.


Commit: d064d157860c3afdd69e8511fb59a3986c8f5ad6
    https://github.com/scummvm/scummvm/commit/d064d157860c3afdd69e8511fb59a3986c8f5ad6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-08T23:31:20+02:00

Commit Message:
DIRECTOR: Do not draw empty desktop on movie transitions

Changed paths:
    engines/director/director.cpp
    engines/director/director.h
    engines/director/score.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 9d84c78442..b36da6a494 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -262,6 +262,8 @@ Common::Error DirectorEngine::run() {
 			// TODO: this is a workaround until the rendering pipeline is reworked
 			if (_currentScore && _currentScore->_surface) {
 				_backSurface.copyFrom(*_currentScore->_surface);
+
+				_newMovieStarted = true;
 			}
 
 			delete _currentScore;
diff --git a/engines/director/director.h b/engines/director/director.h
index 787dd55819..8ed66938e1 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -148,6 +148,7 @@ public:
 	Common::List<MovieReference> _movieStack;
 
 	Graphics::ManagedSurface _backSurface;
+	bool _newMovieStarted;
 
 protected:
 	Common::Error run() override;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 4c0c487431..a0df293bb5 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1578,7 +1578,8 @@ void Score::update() {
 	if (g_system->getMillis() < _nextFrameTime) {
 		renderZoomBox(true);
 
-		_vm->_wm->draw();
+		if (!_vm->_newMovieStarted)
+			_vm->_wm->draw();
 
 		return;
 	}
@@ -1626,9 +1627,11 @@ void Score::update() {
 
 	debugC(1, kDebugImages, "******************************  Current frame: %d", _currentFrame);
 
-	if (_frames[_currentFrame]->_transType != 0)	// Store screen, so we could draw a nice transition
+	if (_frames[_currentFrame]->_transType != 0 && !_vm->_newMovieStarted)	// Store screen, so we could draw a nice transition
 		_backSurface2->copyFrom(*_surface);
 
+	_vm->_newMovieStarted = false;
+
 	_surface->clear(_stageColor);
 	_surface->copyFrom(*_trailSurface);
 


Commit: d04c5c86d177478ac1cb1de0912f2c873c497fb6
    https://github.com/scummvm/scummvm/commit/d04c5c86d177478ac1cb1de0912f2c873c497fb6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-08T23:31:20+02:00

Commit Message:
DIRECTOR: Disable desktop for Director for the time being.

Until the rendering pipeline is fixed, desktop pops up between the
movies which affects transitions. Instead of adding even more hacks,
we disable it for now.

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index b36da6a494..c9b88837e1 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -128,7 +128,7 @@ Common::Error DirectorEngine::run() {
 	_macBinary = nullptr;
 	_soundManager = nullptr;
 
-	_wm = new Graphics::MacWindowManager(Graphics::kWMModalMenuMode);
+	_wm = new Graphics::MacWindowManager(Graphics::kWMModalMenuMode | Graphics::kWMModeNoDesktop);
 
 	_lingo = new Lingo(this);
 	_soundManager = new DirectorSound();