[Scummvm-git-logs] scummvm master -> 094cde56dbe6a1317e4c9c7caddadadc406b6bb0

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7e06f4643d VIDEO: QTVR: Fix nudge command
72d3a8576c DIRECTOR: LINGO: Fix nudge command
094cde56db DIRECTOR: XTRAS: Copy QTVR movie to window for avoiding flicker


Commit: 7e06f4643d84e628065bb21c70f398649bc20d0c
    https://github.com/scummvm/scummvm/commit/7e06f4643d84e628065bb21c70f398649bc20d0c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-07T23:59:45+01:00

Commit Message:
VIDEO: QTVR: Fix nudge command

Changed paths:
    video/qtvr_decoder.cpp


diff --git a/video/qtvr_decoder.cpp b/video/qtvr_decoder.cpp
index 005889f9154..0a97bbd53a7 100644
--- a/video/qtvr_decoder.cpp
+++ b/video/qtvr_decoder.cpp
@@ -216,11 +216,11 @@ void QuickTimeDecoder::nudge(const Common::String &direction) {
 		newFrame = (curFrame - 1 - currentRowStart) % _nav.columns + currentRowStart;
 	} else if (direction.equalsIgnoreCase("right")) {
 		newFrame = (curFrame + 1 - currentRowStart) % _nav.columns + currentRowStart;
-	} else if (direction.equalsIgnoreCase("top")) {
+	} else if (direction.equalsIgnoreCase("up")) {
 		newFrame = curFrame - _nav.columns;
 		if (newFrame < 0)
 			return;
-	} else if (direction.equalsIgnoreCase("bottom")) {
+	} else if (direction.equalsIgnoreCase("down")) {
 		newFrame = curFrame + _nav.columns;
 		if (newFrame >= track->getFrameCount())
 			return;


Commit: 72d3a8576c7de52e6b257fb9026447bbc920cd81
    https://github.com/scummvm/scummvm/commit/72d3a8576c7de52e6b257fb9026447bbc920cd81
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-08T00:00:03+01:00

Commit Message:
DIRECTOR: LINGO: Fix nudge command

Changed paths:
    engines/director/lingo/xtras/qtvrxtra.cpp


diff --git a/engines/director/lingo/xtras/qtvrxtra.cpp b/engines/director/lingo/xtras/qtvrxtra.cpp
index c3e2ebf9e75..deb58c9242b 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/qtvrxtra.cpp
@@ -744,7 +744,7 @@ void QtvrxtraXtra::m_QTVRNudge(int nargs) {
 	Common::String direction = g_lingo->pop().asString();
 
 	if (!(direction.equalsIgnoreCase("left") || direction.equalsIgnoreCase("right") ||
-		  direction.equalsIgnoreCase("top") || direction.equalsIgnoreCase("bottom"))) {
+		  direction.equalsIgnoreCase("up") || direction.equalsIgnoreCase("down"))) {
 		error("QtvrxtraXtra::m_QTVRNudge(): Invald direction: ('%s')!", direction.c_str());
 		return;
 	}


Commit: 094cde56dbe6a1317e4c9c7caddadadc406b6bb0
    https://github.com/scummvm/scummvm/commit/094cde56dbe6a1317e4c9c7caddadadc406b6bb0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-08T00:35:07+01:00

Commit Message:
DIRECTOR: XTRAS: Copy QTVR movie to window for avoiding flicker

Changed paths:
    engines/director/lingo/xtras/qtvrxtra.cpp


diff --git a/engines/director/lingo/xtras/qtvrxtra.cpp b/engines/director/lingo/xtras/qtvrxtra.cpp
index deb58c9242b..f2cc3c83e17 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/qtvrxtra.cpp
@@ -23,6 +23,7 @@
 #include "common/tokenizer.h"
 
 #include "director/director.h"
+#include "director/window.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
@@ -406,7 +407,9 @@ void QtvrxtraXtra::m_QTVRIdle(int nargs) {
 	Graphics::Surface const *frame = me->_video->decodeNextFrame();
 	Graphics::Surface *dither = frame->convertTo(g_director->_wm->_pixelformat, me->_video->getPalette(), 256, g_director->getPalette(), 256, Graphics::kDitherNaive);
 
-	g_system->copyRectToScreen(dither->getPixels(), dither->pitch, me->_rect.left, me->_rect.top, dither->w, dither->h);
+	g_director->getCurrentWindow()->getSurface()->copyRectToSurface(
+			dither->getPixels(), dither->pitch, me->_rect.left, me->_rect.top, dither->w, dither->h
+	);
 
 	dither->free();
 	delete dither;