[Scummvm-git-logs] scummvm master -> 591ab83914bde412585feb35531f2ee9973ac8bd

[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:
72eba878a1 DIRECTOR: Move _wm->draw() to DirectorEngine
591ab83914 DIRECTOR: Fix window initialization


Commit: 72eba878a15cdefeeec1929ab8e10eda829f426f
    https://github.com/scummvm/scummvm/commit/72eba878a15cdefeeec1929ab8e10eda829f426f
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-09T15:40:04-04:00

Commit Message:
DIRECTOR: Move _wm->draw() to DirectorEngine

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


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index d39467896f..b29f3746e7 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -197,6 +197,9 @@ Common::Error DirectorEngine::run() {
 				_currentStage->step();
 			}
 		}
+
+		_wm->renderZoomBox(true);
+		_wm->draw();
 	}
 
 	return Common::kNoError;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 9302c1632a..c7862af3c9 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -257,11 +257,6 @@ void Score::stopPlay() {
 
 void Score::update() {
 	if (g_system->getMillis() < _nextFrameTime && !debugChannelSet(-1, kDebugFast)) {
-		_vm->_wm->renderZoomBox(true);
-
-		if (!_stage->_newMovieStarted)
-			_vm->_wm->draw();
-
 		return;
 	}
 
@@ -386,9 +381,7 @@ void Score::renderFrame(uint16 frameId, RenderMode mode) {
 	if (!renderTransition(frameId))
 		renderSprites(frameId, mode);
 
-	_vm->_wm->renderZoomBox();
 	_stage->render();
-	_vm->_wm->draw();
 
 	if (_frames[frameId]->_sound1 || _frames[frameId]->_sound2)
 		playSoundChannel(frameId);


Commit: 591ab83914bde412585feb35531f2ee9973ac8bd
    https://github.com/scummvm/scummvm/commit/591ab83914bde412585feb35531f2ee9973ac8bd
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-09T15:40:04-04:00

Commit Message:
DIRECTOR: Fix window initialization

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


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index ea148adf5e..b6e06976c8 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -2198,7 +2198,7 @@ void LB::b_window(int nargs) {
 	Graphics::MacWindowManager *wm = g_director->getMacWindowManager();
 	Stage *window = new Stage(wm->getNextId(), false, false, false, wm, g_director);
 	window->setName(windowName);
-	window->resize(640, 480); // FIXME: remove this
+	window->resize(1, 1, true);
 	window->setVisible(false);
 	wm->addWindowInitialized(window);
 	windowList->push_back(window);
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 16f4fa0a16..7455b5b94a 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -23,6 +23,8 @@
 #include "common/config-manager.h"
 #include "common/substream.h"
 
+#include "engines/util.h"
+
 #include "director/director.h"
 #include "director/archive.h"
 #include "director/cast.h"
@@ -103,11 +105,14 @@ bool Movie::loadArchive() {
 		_stage->resize(_movieRect.width(), _movieRect.height(), true);
 	}
 	// TODO: Add more options for desktop dimensions
-	uint16 windowWidth = debugChannelSet(-1, kDebugDesktop) ? 1024 : _movieRect.width();
-	uint16 windowHeight = debugChannelSet(-1, kDebugDesktop) ? 768 : _movieRect.height();
-	if (g_director->_surface->w != windowWidth || g_director->_surface->h != windowHeight) {
-		g_director->_surface->free();
-		g_director->_surface->create(windowWidth, windowHeight, Graphics::PixelFormat::createFormatCLUT8());
+	if (_stage == _vm->getMainStage()) {
+		uint16 windowWidth = debugChannelSet(-1, kDebugDesktop) ? 1024 : _movieRect.width();
+		uint16 windowHeight = debugChannelSet(-1, kDebugDesktop) ? 768 : _movieRect.height();
+		if (_vm->_surface->w != windowWidth || _vm->_surface->h != windowHeight) {
+			_vm->_surface->free();
+			_vm->_surface->create(windowWidth, windowHeight, Graphics::PixelFormat::createFormatCLUT8());
+		}
+		initGraphics(windowWidth, windowHeight);
 	}
 
 	_stage->setStageColor(_stageColor);
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c7862af3c9..cc4d8a9f76 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -25,7 +25,6 @@
 #include "common/memstream.h"
 #include "common/substream.h"
 
-#include "engines/util.h"
 #include "graphics/macgui/mactext.h"
 
 #ifdef USE_PNG
@@ -197,10 +196,6 @@ int Score::getPreviousLabelNumber(int referenceFrame) {
 }
 
 void Score::startPlay() {
-	// TODO: Should the dims be set by the movie?
-	debugC(1, kDebugImages, "Score dims: %dx%d", _movie->_movieRect.width(), _movie->_movieRect.height());
-	initGraphics(_vm->_surface->w, _vm->_surface->h);
-
 	_currentFrame = 0;
 	_playState = kPlayStarted;
 	_nextFrameTime = 0;