1 files changed, 62 insertions, 3 deletions

diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index eedbf36ddd..836d04f7c0 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -143,7 +143,7 @@ int PaletteUsage::process(Common::Array<RGB6> &palette, uint flags) {
 
 	for (uint palIndex = 0; palIndex < palette.size(); ++palIndex) {
 		bool changed = false;
-		int newPalIndex = -1;
+		int newPalIndex = 0xFF;
 		int v1 = palRange[palIndex]._v2;
 
 		if (palette[v1]._flags & 8) {
@@ -229,8 +229,11 @@ int PaletteUsage::process(Common::Array<RGB6> &palette, uint flags) {
 		// In at least scene 318, when the doctor knocks you with the blackjack,
 		// the changed flag can be false
 		//assert(changed);
-		assert(newPalIndex != -1);
-		
+
+		// CHECKME: When pressing on F1 in the first screen, newPalIndex is set to 0xFF at this point
+		// which is a valid value for the index. Maybe a better check would be "< 256" ?
+		//assert(newPalIndex != -1);
+
 		int var52 = (noUsageFlag && palette[palIndex]._u2) ? 2 : 0;
 
 		_vm->_palette->_palFlags[newPalIndex] |= var52 | rgbMask;
@@ -314,6 +317,62 @@ int PaletteUsage::rgbFactor(byte *palEntry, RGB6 &pal6) {
 	return total;
 }
 
+int PaletteUsage::checkRGB(const byte *rgb, int palStart, bool flag, int *palIndex) {
+	Palette &palette = *_vm->_palette;
+	bool match = false;
+	int result;
+	if (palStart >= 0) {
+		result = palStart;
+	} else {
+		result = -1;
+		for (int i = 0; i < palette._highRange; ++i) {
+			if (!palette._rgbList[i]) {
+				result = i;
+				break;
+			}
+		}
+	}
+
+	if (result >= 0) {
+		int mask = 1 << result;
+		byte *palP = &palette._mainPalette[0];
+		uint32 *flagsP = &palette._palFlags[0];
+
+		for (; flagsP < &palette._palFlags[PALETTE_COUNT]; ++flagsP, ++result) {
+			if ((!(*flagsP & 1) || flag) && !(*flagsP & 2)) {
+				if (!memcmp(palP, rgb, 3)) {
+					*flagsP |= mask;
+
+					if (palIndex)
+						*palIndex = result;
+					match = true;
+					break;
+				}
+			}
+		}
+
+		if (!match) {
+			palP = &palette._mainPalette[0];
+			flagsP = &palette._palFlags[0];
+
+			for (int i = 0; i < PALETTE_COUNT; ++i, palP += 3, ++flagsP) {
+				if (!*flagsP) {
+					Common::copy(rgb, rgb + 3, palP);
+					*flagsP |= mask;
+
+					if (palIndex)
+						*palIndex = i;
+					match = true;
+					break;
+				}
+			}
+		}
+	}
+
+	assert(match);
+	return result;
+}
+
 /*------------------------------------------------------------------------*/
 
 void RGBList::clear() {