diff options
Diffstat (limited to 'engines/access/char.cpp')
| -rw-r--r-- | engines/access/char.cpp | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/engines/access/char.cpp b/engines/access/char.cpp index aca7262952..cbe1d5d3d9 100644 --- a/engines/access/char.cpp +++ b/engines/access/char.cpp @@ -31,7 +31,7 @@ CharEntry::CharEntry(const byte *data, AccessEngine *vm) { Common::MemoryReadStream s(data, 999); _charFlag = s.readByte(); - if (vm->getGameID() == GType_MartianMemorandum) { + if (vm->getGameID() != GType_Amazon || !vm->isCD()) { _screenFile.load(s); _estabIndex = s.readSint16LE(); } else { @@ -78,25 +78,12 @@ CharEntry::CharEntry() { /*------------------------------------------------------------------------*/ CharManager::CharManager(AccessEngine *vm) : Manager(vm) { - switch (vm->getGameID()) { - case GType_Amazon: - // Setup character list - if (_vm->isDemo()) { - for (int i = 0; i < 27; ++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], 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"); + // Setup character list + for (uint idx = 0; idx < _vm->_res->CHARTBL.size(); ++idx) { + if (_vm->_res->CHARTBL[idx].size() == 0) + _charTable.push_back(CharEntry()); + else + _charTable.push_back(CharEntry(&_vm->_res->CHARTBL[idx][0], _vm)); } _charFlag = 0; @@ -177,6 +164,10 @@ void CharManager::charMenu() { } else error("Game not supported"); + // Make a backup copy of the screen including the character buttons, + // for restoring when erasing conversation boxes + screen.copyTo(&_vm->_buffer1); + screen.restoreScreen(); delete spr; } |