[Scummvm-git-logs] scummvm master -> 91ca6c99fd247df22f9327bcab578f2db4941ee1

[Strangerke]

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:
91ca6c99fd M4: Fix CID 1532942


Commit: 91ca6c99fd247df22f9327bcab578f2db4941ee1
    https://github.com/scummvm/scummvm/commit/91ca6c99fd247df22f9327bcab578f2db4941ee1
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-06-20T22:24:21+01:00

Commit Message:
M4: Fix CID 1532942

Changed paths:
    engines/m4/wscript/ws_hal.cpp


diff --git a/engines/m4/wscript/ws_hal.cpp b/engines/m4/wscript/ws_hal.cpp
index 22023df5ae4..ed120ccf9df 100644
--- a/engines/m4/wscript/ws_hal.cpp
+++ b/engines/m4/wscript/ws_hal.cpp
@@ -361,7 +361,6 @@ void ws_DoDisplay(Buffer *background, int16 *depth_table, Buffer *screenCodeBuff
 
 void ws_hal_RefreshWoodscriptBuffer(cruncher *myCruncher, Buffer *background,
 		int16 *depth_table, Buffer *screenCodes, uint8 *myPalette, uint8 *ICT) {
-	uint8 myDepth;
 	Buffer drawSpriteBuff;
 	DrawRequest spriteDrawReq;
 
@@ -405,10 +404,13 @@ void ws_hal_RefreshWoodscriptBuffer(cruncher *myCruncher, Buffer *background,
 				drawSpriteBuff.encoding = (uint8)myCCB->source->encoding;
 			drawSpriteBuff.data = myCCB->source->data;
 
-			if (!depth_table || !screenCodes || !screenCodes->data)
-				myDepth = 0;
-			else
-				myDepth = (uint8)(myCCB->layer >> 8);
+			if (!depth_table || !screenCodes || !screenCodes->data) {
+				spriteDrawReq.srcDepth = 0;
+				spriteDrawReq.depthCode = nullptr;
+			} else {
+				spriteDrawReq.srcDepth = (uint8)(myCCB->layer >> 8);
+				spriteDrawReq.depthCode = screenCodes->data;
+			}
 
 			spriteDrawReq.Src = (Buffer *)&drawSpriteBuff;
 			spriteDrawReq.Dest = halScrnBuf;
@@ -416,8 +418,6 @@ void ws_hal_RefreshWoodscriptBuffer(cruncher *myCruncher, Buffer *background,
 			spriteDrawReq.y = myCCB->currLocation->y1;
 			spriteDrawReq.scaleX = myCCB->scaleX;
 			spriteDrawReq.scaleY = myCCB->scaleY;
-			spriteDrawReq.srcDepth = myDepth;
-			spriteDrawReq.depthCode = screenCodes->data;
 			spriteDrawReq.Pal = myPalette;
 			spriteDrawReq.ICT = ICT;