From d192d0b60c574ab6928234ea35f72aace396eda4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 29 Dec 2014 22:51:15 +0100
Subject: ACCESS: MM - Load TEXPAL

---
 engines/access/martian/martian_player.cpp | 2 --
 engines/access/martian/martian_player.h   | 2 +-
 engines/access/martian/martian_room.cpp   | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'engines/access/martian')

diff --git a/engines/access/martian/martian_player.cpp b/engines/access/martian/martian_player.cpp
index 493776e411..f461751438 100644
--- a/engines/access/martian/martian_player.cpp
+++ b/engines/access/martian/martian_player.cpp
@@ -53,8 +53,6 @@ void MartianPlayer::load() {
 	_upWalkMax = 14;
 	_downWalkMin = 15;
 	_downWalkMax = 23;
-
-	warning("TODO: Copy texPal into manPal");
 }
 
 } // End of namespace Martian
diff --git a/engines/access/martian/martian_player.h b/engines/access/martian/martian_player.h
index 192f2540cc..63a21a1c24 100644
--- a/engines/access/martian/martian_player.h
+++ b/engines/access/martian/martian_player.h
@@ -37,7 +37,7 @@ private:
 	MartianEngine *_game;
 public:
 	MartianPlayer(AccessEngine *vm);
-
+	Resource *_texPal;
 	virtual void load();
 };
 
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index 972aada5d6..dfc0dbcd5e 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -43,13 +43,12 @@ void MartianRoom::loadRoom(int roomNumber) {
 }
 
 void MartianRoom::reloadRoom() {
-	warning("TODO: Load TEXPAL.COL");
 //	_vm->_currentMan = _roomFlag;
 //	_vm->_currentManOld = _roomFlag;
 //	_vm->_manScaleOff = 0;
 
+	_vm->_player->loadTexPalette();
 	_vm->_player->loadSprites("TEX.LZ");
-	warning("TODO: Load TEXPAL.COL");
 
 	loadRoom(_vm->_player->_roomNumber);
 
-- 
cgit v1.2.3