libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACCESS: MM - Fix the "android" watch dialog and animation

Browse Source
This commit is contained in:
Strangerke 2015-01-21 00:26:11 +01:00
parent c810ee9a5a
commit f60a4d3e71
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/access/char.cpp
View File

@ -27,19 +27,30 @@
namespace Access {
CharEntry::CharEntry(const byte *data, int gameType) {
CharEntry::CharEntry(const byte *data, AccessEngine *vm) {
Common::MemoryReadStream s(data, 999);
_charFlag = s.readByte();
if (gameType == GType_MartianMemorandum)
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");
}
_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()) {
@ -77,16 +88,16 @@ 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], vm->getGameID()));
_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->getGameID()));
_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->getGameID()));
_charTable.push_back(CharEntry(Martian::CHARTBL_MM[i], vm));
break;
default:

2
engines/access/char.h
View File

@ -41,7 +41,7 @@ public:
FileIdent _scriptFile;
Common::Array<ExtraCell> _extraCells;
public:
CharEntry(const byte *data, int gameType);
CharEntry(const byte *data, AccessEngine *vm);
CharEntry();
};