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

[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:
f66d898dee SCUMM: Clean up Smirk close-up workarounds


Commit: f66d898dee2452173d25255c59b285c0cadacebf
    https://github.com/scummvm/scummvm/commit/f66d898dee2452173d25255c59b285c0cadacebf
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-04-26T14:45:30+02:00

Commit Message:
SCUMM: Clean up Smirk close-up workarounds

I decided I prefer an empty if clause (which I find easier to read than
inverting the whole condition) than a premature break.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index aad8de2c146..a3f87e685f7 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -511,6 +511,11 @@ void ScummEngine_v5::o5_actorOps() {
 			// remap the colors, it uses the wrong indexes. The
 			// CD animation uses colors 1-3, where the floppy
 			// version uses 2, 3, and 9.
+			//
+			// We don't touch the colours in general - the Special
+			// edition have pretty much made them canon anyway -
+			// but for the Smirk close-up we want the same colors
+			// as the floppy version.
 
 			if (_game.id == GID_MONKEY && _currentRoom == 76) {
 				if (i == 3)
@@ -1972,10 +1977,11 @@ void ScummEngine_v5::o5_roomOps() {
 			// we want the original color 3 for the cigar smoke. It
 			// should be ok since there is no GUI in this scene.
 
-			if (_game.id == GID_MONKEY && _currentRoom == 76 && d == 3 && _enableEnhancements)
-				break;
-
-			setPalColor(d, a, b, c);	/* index, r, g, b */
+			if (_game.id == GID_MONKEY && _currentRoom == 76 && d == 3 && _enableEnhancements) {
+				// Do nothing
+			} else {
+				setPalColor(d, a, b, c);	/* index, r, g, b */
+			}
 		}
 		break;
 	case 5:		// SO_ROOM_SHAKE_ON