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

[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:
d0ac6fc453 SCUMM: Clean up DOTT Chron-O-John workaround a bit


Commit: d0ac6fc453ceb73abcc7fa60a792ddaf5b35361c
    https://github.com/scummvm/scummvm/commit/d0ac6fc453ceb73abcc7fa60a792ddaf5b35361c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-04-25T09:51:51+02:00

Commit Message:
SCUMM: Clean up DOTT Chron-O-John workaround a bit

With the last set of adjustments, it no longer seems necessary to check
which frame of the lid animation is being drawn. I count that as a win!

Changed paths:
    engines/scumm/costume.cpp


diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 18421b04726..8c34639aae4 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -917,23 +917,21 @@ byte ClassicCostumeRenderer::drawLimb(const Actor *a, int limb) {
 			// the left both the lid and the face are mirrored when
 			// only his face should be.
 			//
-			// We adjust the positioning a bit (though not while the
-			// lid is opening, since that causes further glitches),
-			// and make sure that the lid is always drawn the
-			// correct way.
+			// We adjust the positioning a bit, and make sure the
+			// lid is always mirrored the same way.
 
 			bool mirror = _mirror;
 
 			if (_vm->_game.id == GID_TENTACLE && _vm->_currentRoom == 61 && a->_number == 1 && _loaded._id == 324 && _vm->_enableEnhancements) {
 				if (limb == 0) {
 					_mirror = true;
-					byte frm = a->_cost.curpos[3] & 0x0FF;
-					if (frm == 0x3D || frm == 0x3E)
-						xmoveCur--;
-				} else if (a->getFacing() == 270 && !_mirror) {
-					xmoveCur += 4;
-				} else if (a->getFacing() == 90) {
 					xmoveCur--;
+				} else {
+					if (a->getFacing() == 270) {
+						xmoveCur += 4;
+					} else {
+						xmoveCur--;
+					}
 				}
 			}