[Scummvm-git-logs] scummvm master -> 231023244e73e3f93c8547097decd2c2239ca8ad

[neuromancer]

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

Summary:
c63f537a9a FREESCAPE: avoid crashing parsing driller conditions for zx
231023244e FREESCAPE: improved rendering of stipple in shader renderer


Commit: c63f537a9ab8b0a3c4ae0be0d4ef13306ece29d9
    https://github.com/scummvm/scummvm/commit/c63f537a9ab8b0a3c4ae0be0d4ef13306ece29d9
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-04-05T09:28:51+02:00

Commit Message:
FREESCAPE: avoid crashing parsing driller conditions for zx

Changed paths:
    engines/freescape/language/8bitDetokeniser.cpp


diff --git a/engines/freescape/language/8bitDetokeniser.cpp b/engines/freescape/language/8bitDetokeniser.cpp
index 16f57bf2924..988182045d5 100644
--- a/engines/freescape/language/8bitDetokeniser.cpp
+++ b/engines/freescape/language/8bitDetokeniser.cpp
@@ -54,7 +54,8 @@ Common::String detokenise8bitCondition(Common::Array<uint8> &tokenisedCondition,
 		 0, 0, 0, 0, 0, 0, 2, 2,
 		 1};
 
-	detokenisedStream += Common::String::format("CONDITION FLAG: %x\n", tokenisedCondition[0]);
+	if (sizeOfTokenisedContent > 0)
+		detokenisedStream += Common::String::format("CONDITION FLAG: %x\n", tokenisedCondition[0]);
 	Token::Type newConditional = Token::UNKNOWN;
 	Token::Type oldConditional = Token::UNKNOWN;
 


Commit: 231023244e73e3f93c8547097decd2c2239ca8ad
    https://github.com/scummvm/scummvm/commit/231023244e73e3f93c8547097decd2c2239ca8ad
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-04-05T09:28:51+02:00

Commit Message:
FREESCAPE: improved rendering of stipple in shader renderer

Changed paths:
    engines/freescape/gfx_opengl_shaders.cpp


diff --git a/engines/freescape/gfx_opengl_shaders.cpp b/engines/freescape/gfx_opengl_shaders.cpp
index d14ee7dc874..d43f8966bbc 100644
--- a/engines/freescape/gfx_opengl_shaders.cpp
+++ b/engines/freescape/gfx_opengl_shaders.cpp
@@ -290,7 +290,7 @@ void OpenGLShaderRenderer::setStippleData(byte *data) {
 		byte b = data[i];
 		for (int j = 0; j < 8; j++) {
 			//debug("%d", 8*i + j);
-			_variableStippleArray[8*i + j] = b & 0x1;
+			_variableStippleArray[i + 8*j] = b & 0x1;
 			b = b >> 1;
 		}
 	}