SCI: Fix Mac icon bar palettes

The Mac icon bar uses a palette from the executable and keeps those entries in the palette constantly.

In addition, we're now performing gamma correction on the Mac-based colors so that they are in the same gamma as SCI. The color matching now works with this and using the same color finding as the Mac Palette Manager.

1 files changed, 9 insertions, 0 deletions

diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 9404425af6..b3e398325f 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -27,6 +27,7 @@
 #define SCI_H
 
 #include "engines/engine.h"
+#include "common/macresman.h"
 #include "common/util.h"
 #include "common/random.h"
 #include "sci/engine/vm_types.h"	// for Selector
@@ -323,6 +324,8 @@ public:
 
 	DebugState _debugState;
 
+	Common::MacResManager *getMacExecutable() { return &_macExecutable; }
+
 private:
 	/**
 	 * Initializes a SCI game
@@ -349,6 +352,11 @@ private:
 	 */
 	void exitGame();
 
+	/**
+	 * Loads the Mac executable for SCI1 games
+	 */
+	void loadMacExecutable();
+
 	void initStackBaseWithSelector(Selector selector);
 
 	bool gameHasFanMadePatch();
@@ -366,6 +374,7 @@ private:
 	reg_t _gameSuperClassAddress; // Address of the super class of the game object
 	Console *_console;
 	Common::RandomSource _rng;
+	Common::MacResManager _macExecutable;
 };