[Scummvm-git-logs] scummvm master -> 1c13254f832601c409110f94ea4500dfd33d7f58

[Die4Ever]

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:
1c13254f83 GROOVIE: fix The Making of T11H video scaling


Commit: 1c13254f832601c409110f94ea4500dfd33d7f58
    https://github.com/scummvm/scummvm/commit/1c13254f832601c409110f94ea4500dfd33d7f58
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-02-20T18:23:57-06:00

Commit Message:
GROOVIE: fix The Making of T11H video scaling

Changed paths:
    engines/groovie/video/roq.cpp


diff --git a/engines/groovie/video/roq.cpp b/engines/groovie/video/roq.cpp
index a80ac5df742..417097fb76d 100644
--- a/engines/groovie/video/roq.cpp
+++ b/engines/groovie/video/roq.cpp
@@ -286,7 +286,7 @@ void writeImage(const Common::String filename, Graphics::Surface &surface) {
 	if (surface.h == 0 || surface.w == 0) {
 		return;
 	}
-	Common::String tname = "imgf/" + filename;
+	Common::String tname = "img/" + filename;
 #ifdef USE_PNG
 	tname += ".png";
 #else
@@ -603,9 +603,9 @@ bool ROQPlayer::processBlockInfo(ROQBlockHeader &blockHeader) {
 	debugC(2, kDebugVideo, "Groovie::ROQ: width=%d, height=%d, scaleX=%d, scaleY=%d, _offScale=%d, interl.=%d, _alpha=%d", width, height, _scaleX, _scaleY, _interlacedVideo, _offScale, _alpha);
 
 	// Switch from/to fullscreen, if needed
-	if (_screen->h != 480 && height == 480)
+	if (_screen->h != 480 && height * _scaleY == 480)
 		_vm->_graphicsMan->switchToFullScreen(true);
-	else if (_screen->h == 480 && height != 480)
+	else if (_screen->h == 480 && height * _scaleY != 480)
 		_vm->_graphicsMan->switchToFullScreen(false);
 
 	// TODO: Clear the buffers with black