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

[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:
dd58587960 DIRECTOR: Fix director test execution


Commit: dd58587960f00b68076638ceb1e8e2a8cee718ca
    https://github.com/scummvm/scummvm/commit/dd58587960f00b68076638ceb1e8e2a8cee718ca
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-01T19:11:18+02:00

Commit Message:
DIRECTOR: Fix director test execution

Changed paths:
    engines/director/cast.cpp
    engines/director/tests.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 5ac8463b96..83c9740975 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -179,7 +179,7 @@ bool Cast::loadArchive() {
 		delete r;
 	} else if (_movie) {
 		// TODO: Source this from somewhere!
-		_movie->_movieRect = Common::Rect(0, 0, 640, 480);
+		_movie->_movieRect = Common::Rect(0, 0, 639, 479);
 		_movie->_stageColor = 1;
 	}
 
diff --git a/engines/director/tests.cpp b/engines/director/tests.cpp
index a804012798..2c6bfa1269 100644
--- a/engines/director/tests.cpp
+++ b/engines/director/tests.cpp
@@ -46,10 +46,9 @@ namespace Director {
 void DirectorEngine::testFontScaling() {
 	int x = 10;
 	int y = 10;
-	int w = 640;
-	int h = 480;
+	int w = g_system->getWidth();
+	int h = g_system->getHeight();
 
-	initGraphics(w, h);
 	setPalette(-1);
 
 	Graphics::ManagedSurface surface;
@@ -282,6 +281,8 @@ void DirectorEngine::runTests() {
 	Common::MemoryReadStream *movie = new Common::MemoryReadStream(testMovie, ARRAYSIZE(testMovie));
 	Common::SeekableReadStream *stream = Common::wrapCompressedReadStream(movie);
 
+	initGraphics(640, 480);
+
 	_mainArchive = new RIFXArchive();
 	if (!_mainArchive->openStream(stream, 0)) {
 		error("DirectorEngine::runTests(): Bad movie data");