diff options
Diffstat (limited to 'engines/access/char.cpp')
-rw-r--r-- | engines/access/char.cpp | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/engines/access/char.cpp b/engines/access/char.cpp index b359bcf13a..aca7262952 100644 --- a/engines/access/char.cpp +++ b/engines/access/char.cpp @@ -27,15 +27,25 @@ namespace Access { -CharEntry::CharEntry(const byte *data) { +CharEntry::CharEntry(const byte *data, AccessEngine *vm) { Common::MemoryReadStream s(data, 999); _charFlag = s.readByte(); - _estabIndex = s.readSint16LE(); - _screenFile.load(s); + if (vm->getGameID() == GType_MartianMemorandum) { + _screenFile.load(s); + _estabIndex = s.readSint16LE(); + } else { + _estabIndex = s.readSint16LE(); + _screenFile.load(s); + } + _paletteFile.load(s); _startColor = s.readUint16LE(); - _numColors = s.readUint16LE(); + if (vm->getGameID() == GType_MartianMemorandum) { + int lastColor = s.readUint16LE(); + _numColors = lastColor - _startColor; + } else + _numColors = s.readUint16LE(); // Load cells for (byte cell = s.readByte(); cell != 0xff; cell = s.readByte()) { @@ -73,12 +83,18 @@ CharManager::CharManager(AccessEngine *vm) : Manager(vm) { // Setup character list if (_vm->isDemo()) { for (int i = 0; i < 27; ++i) - _charTable.push_back(CharEntry(Amazon::CHARTBL_DEMO[i])); + _charTable.push_back(CharEntry(Amazon::CHARTBL_DEMO[i], vm)); } else { for (int i = 0; i < 37; ++i) - _charTable.push_back(CharEntry(Amazon::CHARTBL[i])); + _charTable.push_back(CharEntry(Amazon::CHARTBL[i], vm)); } break; + + case GType_MartianMemorandum: + for (int i = 0; i < 27; ++i) + _charTable.push_back(CharEntry(Martian::CHARTBL_MM[i], vm)); + break; + default: error("Unknown game"); } @@ -152,8 +168,14 @@ void CharManager::charMenu() { screen.saveScreen(); screen.setDisplayScan(); - screen.plotImage(spr, 17, Common::Point(0, 176)); - screen.plotImage(spr, 18, Common::Point(155, 176)); + if (_vm->getGameID() == GType_MartianMemorandum) { + screen.plotImage(spr, 17, Common::Point(0, 184)); + screen.plotImage(spr, 18, Common::Point(193, 184)); + } else if (_vm->getGameID() == GType_Amazon) { + screen.plotImage(spr, 17, Common::Point(0, 176)); + screen.plotImage(spr, 18, Common::Point(155, 176)); + } else + error("Game not supported"); screen.restoreScreen(); delete spr; |