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

[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:
d1fdf1ca20 GROOVIE: fix graphics for Clan chess puzzle


Commit: d1fdf1ca20fdb0ead0ebb1d12fd801dd10b24aee
    https://github.com/scummvm/scummvm/commit/d1fdf1ca20fdb0ead0ebb1d12fd801dd10b24aee
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-02-16T15:07:20-06:00

Commit Message:
GROOVIE: fix graphics for Clan chess puzzle

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


diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index ed75361d775..99f15ca624c 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -944,6 +944,9 @@ bool Script::playvideofromref(uint32 fileref, bool loopUntilAudioDone) {
 			// Original clan engine specifically references these files by name to set the flag
 			else if (_version == kGroovieCDY && (resInfo.filename.hasPrefix("act") || resInfo.filename.hasPrefix("door")))
 				_bitflags |= (1 << 14);
+			// HACK: Clandestiny bricks puzzle appears to use different behavior for copying the _overBuf to the _bg
+			if (_version == kGroovieCDY && _scriptFile == "26a_graf.grv")
+				_bitflags |= 1;
 			_vm->_videoPlayer->load(_videoFile, _bitflags);
 		} else {
 			error("Groovie::Script: Couldn't open file");
diff --git a/engines/groovie/video/roq.cpp b/engines/groovie/video/roq.cpp
index ddd7221c119..fd31ad01952 100644
--- a/engines/groovie/video/roq.cpp
+++ b/engines/groovie/video/roq.cpp
@@ -157,6 +157,7 @@ uint16 ROQPlayer::loadInternal() {
 	_flagOverlay = ((_flags & (1 << 2)) != 0);
 	_altMotionDecoder = ((_flags & (1 << 14)) != 0);
 	_flagMasked = ((_flags & (1 << 10)) != 0);
+	bool flagBricks = ((_flags & 1) != 0);
 
 	if (gDebugLevel >= 8 && DebugMan.isDebugChannelEnabled(kDebugVideo)) {
 		dumpAllSurfaces("loadInternal");
@@ -164,7 +165,7 @@ uint16 ROQPlayer::loadInternal() {
 
 	if (!_flagOverlay && _flagNoPlay) {
 		// Clandestiny's bricks puzzle needs this copy to bg
-		if(oldOverlay && _overBuf->w && _vm->getEngineVersion() == kGroovieCDY)
+		if (oldOverlay && _overBuf->w && flagBricks)
 			_bg->copyFrom(*_overBuf);
 		clearOverlay();
 	}