[Scummvm-git-logs] scummvm master -> 2937c616ae806884908470bdc384b55fbf0afe04

[eriktorbjorn]

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:
2937c616ae SCUMM: Fix glitch introduced by DOTT Chron-O-John workaround


Commit: 2937c616ae806884908470bdc384b55fbf0afe04
    https://github.com/scummvm/scummvm/commit/2937c616ae806884908470bdc384b55fbf0afe04
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-05-21T09:51:14+02:00

Commit Message:
SCUMM: Fix glitch introduced by DOTT Chron-O-John workaround

The mainRoutine() function returns a byte, not a bool. This caused text
to be partly erased when drugging the piranha poodles in MI1. Probably
other things as well.

Changed paths:
    engines/scumm/costume.cpp


diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index fe47f6376dd..5bbacde979a 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -948,7 +948,7 @@ byte ClassicCostumeRenderer::drawLimb(const Actor *a, int limb) {
 				}
 			}
 
-			bool result = mainRoutine(xmoveCur, ymoveCur);
+			byte result = mainRoutine(xmoveCur, ymoveCur);
 
 			_mirror = mirror;
 			return result;