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

[sev-]

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:
da6122fdec SLUDGE: Fix drawModeDark colourmix values by swapping them


Commit: da6122fdec12c870fb1ed6af4cf0b0152d796066
    https://github.com/scummvm/scummvm/commit/da6122fdec12c870fb1ed6af4cf0b0152d796066
Author: polyesterswing (kurianjojo2004 at gmail.com)
Date: 2023-12-14T18:24:56+01:00

Commit Message:
SLUDGE: Fix drawModeDark colourmix values by swapping them

In Out of Order, if you visit the alley that goes to the surgery you
will notice a jarring transition between colours on Hurford.

Changed paths:
    engines/sludge/people.cpp


diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index 975dea6a651..294b6abb9b7 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -333,6 +333,15 @@ enum drawModes {
 };
 
 void PeopleManager::setMyDrawMode(OnScreenPerson *moveMe, int h) {
+	int hasBadDrawMode = 0;
+
+	if (gameVersion > VERSION(1, 7)) {
+		hasBadDrawMode = 1;
+		warning("Versions above 1.7 have bad values set for drawModeDark");
+	}
+
+	const int colourMix[2][3] = { {64, 128, 192}, {192, 128, 64} };
+
 	switch (h) {
 	case drawModeTransparent3:
 		moveMe->r = moveMe->g = moveMe->b = 0;
@@ -356,17 +365,17 @@ void PeopleManager::setMyDrawMode(OnScreenPerson *moveMe, int h) {
 		break;
 	case drawModeDark1:
 		moveMe->r = moveMe->g = moveMe->b = 0;
-		moveMe->colourmix = 192;
+		moveMe->colourmix = colourMix[hasBadDrawMode][0];
 		moveMe->transparency = 0;
 		break;
 	case drawModeDark2:
 		moveMe->r = moveMe->g = moveMe->b = 0;
-		moveMe->colourmix = 128;
+		moveMe->colourmix = colourMix[hasBadDrawMode][1];
 		moveMe->transparency = 0;
 		break;
 	case drawModeDark3:
 		moveMe->r = moveMe->g = moveMe->b = 0;
-		moveMe->colourmix = 64;
+		moveMe->colourmix = colourMix[hasBadDrawMode][2];
 		moveMe->transparency = 0;
 		break;
 	case drawModeBlack: