[Scummvm-git-logs] scummvm master -> 5b7a2b11152f1edfe80f48a11fc3ac80952d5dc3

[AndywinXp]

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

Summary:
5b7a2b1115 SCUMM/HE: PAJAMA3: Fix #16168


Commit: 5b7a2b11152f1edfe80f48a11fc3ac80952d5dc3
    https://github.com/scummvm/scummvm/commit/5b7a2b11152f1edfe80f48a11fc3ac80952d5dc3
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-09-09T22:47:07+02:00

Commit Message:
SCUMM/HE: PAJAMA3: Fix #16168

This fixes #16168:

"SCUMM/HE: Pajama Sam 3: Graphical glitch when enter the room with Mikey"

Honestly at this point our implementation of this and some more routines look
completely different from the source code, so this fix is not a direct consequence
of something found on the source code or disasm... It still looks competent enough
for how our code is written.

Not to mention, I wrote the lines which fixed another issue but caused this one,
and for the life of me I can't remember why :-)

Changed paths:
    engines/scumm/akos.cpp


diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp
index fc60c23e390..e0df022f4ca 100644
--- a/engines/scumm/akos.cpp
+++ b/engines/scumm/akos.cpp
@@ -882,6 +882,9 @@ byte AkosRenderer::paintCelByleRLE(int xMoveCur, int yMoveCur) {
 			compData.boundsRect = _clipOverride;
 			compData.boundsRect.right += 1;
 			compData.boundsRect.bottom += 1;
+
+			compData.boundsRect.right = CLIP<int16>(compData.boundsRect.right, 0, _vm->_screenWidth);
+			compData.boundsRect.bottom = CLIP<int16>(compData.boundsRect.bottom, 0, _vm->_screenHeight);
 		}
 	}
 
@@ -930,7 +933,7 @@ byte AkosRenderer::paintCelByleRLE(int xMoveCur, int yMoveCur) {
 			skipCelLines(compData, linesToSkip)	;
 			compData.x = compData.boundsRect.right - 1;
 		} else {
-			linesToSkip = (compData.boundsRect.left -1) - rect.left;
+			linesToSkip = (compData.boundsRect.left - 1) - rect.left;
 
 			if (linesToSkip <= 0)
 				drawFlag = 2;