ACCESS: MM - Implement setManPalette

3 files changed, 11 insertions, 11 deletions

diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index c4f38d8f99..10e9d60cca 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -57,12 +57,7 @@ void MartianRoom::reloadRoom() {
 
 void MartianRoom::reloadRoom1() {
 	_selectCommand = -1;
-
-// CHECKME: Useful?
-//	_vm->_events->setNormalCursor(CURSOR_CROSSHAIRS);
-//	_vm->_mouseMode = 0;
-//	_vm->_boxSelect = true;
-
+	warning("TODO: _word1F968 = -1;");
 	_vm->_player->_playerOff = false;
 
 	_vm->_screen->forceFadeOut();
@@ -83,11 +78,7 @@ void MartianRoom::reloadRoom1() {
 	buildScreen();
 	_vm->copyBF2Vid();
 
-	//
-	warning("TODO: setManPalette");
-	Common::copy(_vm->_player->_manPal1 + 0x2A0, _vm->_player->_manPal1 + 0x2A0 + 0x42, _vm->_screen->_manPal);
-	//
-
+	_vm->_screen->setManPalette();
 	_vm->_events->showCursor();
 	_vm->_player->_frame = 0;
 	_vm->_oldRects.clear();
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 35069ba683..ec2a825ba8 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -112,6 +112,10 @@ void Screen::setInitialPalettte() {
 	g_system->getPaletteManager()->setPalette(INITIAL_PALETTE, 0, 18);
 }
 
+void Screen::setManPalette() {
+	Common::copy(_vm->_player->_manPal1 + 0x2A0, _vm->_player->_manPal1 + 0x2A0 + 0x42, _rawPalette + 672);
+}
+
 void Screen::loadPalette(int fileNum, int subfile) {
 	Resource *res = _vm->_files->loadFile(fileNum, subfile);
 	byte *palette = res->data();
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 0fa111c21c..dcf339a1d3 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -139,6 +139,11 @@ public:
 	 */
 	void setIconPalette() {}
 
+	/**
+	 * Set Tex palette (Martian Memorandum)
+	 */
+	void setManPalette();
+
 	void loadPalette(int fileNum, int subfile);
 
 	void setPalette();