ACCESS: MM - Implement missing bits of CharEntry

1 files changed, 5 insertions, 10 deletions

diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index d2b1aa65cd..b3b026b6c9 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -31,17 +31,12 @@ CharEntry::CharEntry(const byte *data, AccessEngine *vm) {
 	Common::MemoryReadStream s(data, 999);
 
 	_charFlag = s.readByte();
-	if (vm->getGameID() == GType_MartianMemorandum)
-		_estabIndex = -1;
-	else
-		_estabIndex = s.readSint16LE();
-
-	_screenFile.load(s);
-
 	if (vm->getGameID() == GType_MartianMemorandum) {
-		int idx = s.readSint16LE();
-		if (idx != -1)
-			warning("TODO: more CharEntry");
+		_screenFile.load(s);
+		_estabIndex = s.readSint16LE();
+	} else {
+		_estabIndex = s.readSint16LE();
+		_screenFile.load(s);
 	}
 
 	_paletteFile.load(s);