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

[athrxx]

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:
b56c26f134 KYRA: (HOF) - fix bug no. 13709 (Zanthia walks through a rock in Volcania)


Commit: b56c26f134cc5b725efd9fe660f55dae05570f6a
    https://github.com/scummvm/scummvm/commit/b56c26f134cc5b725efd9fe660f55dae05570f6a
Author: athrxx (athrxx at scummvm.org)
Date: 2022-07-17T15:56:54+02:00

Commit Message:
KYRA: (HOF) - fix bug no. 13709 (Zanthia walks through a rock in Volcania)

Changed paths:
    engines/kyra/graphics/screen.cpp


diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index b8369f708e7..d11dcc075ac 100644
--- a/engines/kyra/graphics/screen.cpp
+++ b/engines/kyra/graphics/screen.cpp
@@ -1736,14 +1736,14 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 	const int ppc = (flags >> 8) & 0x3F;
 	_dsPlot = dsPlotFunc[ppc];
 	DsPlotFunc dsPlot2 = dsPlotFunc[ppc], dsPlot3 = dsPlotFunc[ppc];
-	if (flags & kDRAWSHP_PRIORITY)
-		dsPlot3 = dsPlotFunc[((flags >> 8) & 0xF7) & 0x3F];
+	if (_vm->gameFlags().gameID == GI_KYRA3 && (flags & kDRAWSHP_PRIORITY))
+		dsPlot3 = dsPlotFunc[ppc & ~8];
 
 	if (!_dsPlot || !dsPlot2 || !dsPlot3) {
 		if (!dsPlot2)
 			warning("Missing drawShape plotting method type %d", ppc);
 		if (dsPlot3 != dsPlot2 && !dsPlot3)
-			warning("Missing drawShape plotting method type %d", (((flags >> 8) & 0xF7) & 0x3F));
+			warning("Missing drawShape plotting method type %d", ppc & ~8);
 		return;
 	}