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

[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:
987065e090 DIRECTOR: allow customizing desktop mode size
a03adf30ac DIRECTOR: set window size in Kids Box


Commit: 987065e0908fde4596b2c775b661a4afdb98544d
    https://github.com/scummvm/scummvm/commit/987065e0908fde4596b2c775b661a4afdb98544d
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2022-07-07T15:59:41+02:00

Commit Message:
DIRECTOR: allow customizing desktop mode size

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


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index b3e8ab82fe7..d77b1d1cf1f 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -86,6 +86,8 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 	_fixStageSize = false;
 	_fixStageRect = Common::Rect();
 	_wmMode = debugChannelSet(-1, kDebugDesktop) ? wmModeDesktop : wmModeFullscreen;
+	_wmWidth = 1024;
+	_wmHeight = 768;
 
 	_wm = nullptr;
 
diff --git a/engines/director/director.h b/engines/director/director.h
index 5d687e9f41f..47b90d277a6 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -242,6 +242,8 @@ public:
 	Common::FSNode _gameDataDir;
 	CastMemberID *_clipBoard;
 	uint32 _wmMode;
+	uint16 _wmWidth;
+	uint16 _wmHeight;
 
 private:
 	byte *_currentPalette;
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 2ac41aa2dd4..c76633bcdf7 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -150,8 +150,8 @@ bool Movie::loadArchive() {
 
 	// TODO: Add more options for desktop dimensions
 	if (_window == _vm->getStage()) {
-		uint16 windowWidth = g_director->desktopEnabled() ? 1024 : _movieRect.width();
-		uint16 windowHeight = g_director->desktopEnabled() ? 768 : _movieRect.height();
+		uint16 windowWidth = g_director->desktopEnabled() ? g_director->_wmWidth : _movieRect.width();
+		uint16 windowHeight = g_director->desktopEnabled() ? g_director->_wmHeight : _movieRect.height();
 		if (_vm->_wm->_screenDims.width() != windowWidth || _vm->_wm->_screenDims.height() != windowHeight) {
 			_vm->_wm->resizeScreen(windowWidth, windowHeight);
 			recenter = true;


Commit: a03adf30ac9826fa31f5a8ed7e5dd6ebd0b1e175
    https://github.com/scummvm/scummvm/commit/a03adf30ac9826fa31f5a8ed7e5dd6ebd0b1e175
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2022-07-07T15:59:41+02:00

Commit Message:
DIRECTOR: set window size in Kids Box

Changed paths:
    engines/director/game-quirks.cpp


diff --git a/engines/director/game-quirks.cpp b/engines/director/game-quirks.cpp
index 1c84c6ff31d..cba38b3b6ae 100644
--- a/engines/director/game-quirks.cpp
+++ b/engines/director/game-quirks.cpp
@@ -29,6 +29,10 @@ static void quirkKidsBox() {
     // will pick a game window that fits the splash screen and then try
     // to squish the full size game window into it.
     g_director->_wmMode = Director::wmModeDesktop;
+    // Game runs in 640x480; clipping it to this size ensures the main
+    // game window takes up the full screen, and only the splash is windowed.
+    g_director->_wmWidth = 640;
+    g_director->_wmHeight = 480;
 }
 
 static void quirkLzone() {