[Scummvm-git-logs] scummvm master -> 7083b74e2ee89e94bdd44a6750b1ad9a4de81dab

[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:
7083b74e2e GROOVIE: roq change some errors to warnings in order to allow slightly corrupted videos to play


Commit: 7083b74e2ee89e94bdd44a6750b1ad9a4de81dab
    https://github.com/scummvm/scummvm/commit/7083b74e2ee89e94bdd44a6750b1ad9a4de81dab
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-02-23T23:15:33-06:00

Commit Message:
GROOVIE: roq change some errors to warnings in order to allow slightly corrupted videos to play

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


diff --git a/engines/groovie/video/roq.cpp b/engines/groovie/video/roq.cpp
index 6c0da3f690a..65dc100070b 100644
--- a/engines/groovie/video/roq.cpp
+++ b/engines/groovie/video/roq.cpp
@@ -899,10 +899,11 @@ byte ROQPlayer::getCodingType() {
 
 void ROQPlayer::paint2(byte i, int destx, int desty) {
 	if (i > _num2blocks) {
-		error("Groovie::ROQ: Invalid 2x2 block %d (%d available)", i, _num2blocks);
+		warning("Groovie::ROQ: Invalid 2x2 block %d (%d available)", i, _num2blocks);
+		return;
 	}
 
-	uint32 *block = _codebook2 + i * 4;
+	uint32 *block = &_codebook2[i * 4];
 	uint32 *ptr = (uint32 *)_currBuf->getBasePtr(destx, desty);
 	uint32 pitch = _currBuf->pitch / 4;
 
@@ -914,7 +915,8 @@ void ROQPlayer::paint2(byte i, int destx, int desty) {
 
 void ROQPlayer::paint4(byte i, int destx, int desty) {
 	if (i > _num4blocks) {
-		error("Groovie::ROQ: Invalid 4x4 block %d (%d available)", i, _num4blocks);
+		warning("Groovie::ROQ: Invalid 4x4 block %d (%d available)", i, _num4blocks);
+		return;
 	}
 
 	byte *block4 = &_codebook4[i * 4];
@@ -928,13 +930,14 @@ void ROQPlayer::paint4(byte i, int destx, int desty) {
 
 void ROQPlayer::paint8(byte i, int destx, int desty) {
 	if (i > _num4blocks) {
-		error("Groovie::ROQ: Invalid 4x4 block %d (%d available)", i, _num4blocks);
+		warning("Groovie::ROQ: Invalid 4x4 block %d (%d available)", i, _num4blocks);
+		return;
 	}
 
 	byte *block4 = &_codebook4[i * 4];
 	for (int y4 = 0; y4 < 2; y4++) {
 		for (int x4 = 0; x4 < 2; x4++) {
-			uint32 *block2 = _codebook2 + *block4++ * 4;
+			uint32 *block2 = &_codebook2[*block4++ * 4];
 
 			for (int y2 = 0; y2 < 2; y2++) {
 				for (int x2 = 0; x2 < 2; x2++) {