diff options
| -rw-r--r-- | engines/mohawk/bitmap.cpp | 4 | ||||
| -rw-r--r-- | engines/mohawk/file.cpp | 6 | ||||
| -rw-r--r-- | engines/mohawk/myst_scripts.h | 50 | ||||
| -rw-r--r-- | engines/mohawk/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/mohawk/sound.h | 2 |
5 files changed, 32 insertions, 32 deletions
diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp index 4f178b2d75..8afdc6150d 100644 --- a/engines/mohawk/bitmap.cpp +++ b/engines/mohawk/bitmap.cpp @@ -322,7 +322,7 @@ void MohawkBitmap::unpackRiven() { static byte getLastTwoBits(byte c) { return (c & 0x03); } - + static byte getLastThreeBits(byte c) { return (c & 0x07); } @@ -408,7 +408,7 @@ void MohawkBitmap::handleRivenSubcommandStream(byte count, byte *&dst) { B_LASTDUPLET(); } else if (cmd == 0x50) { // Output two absolute pixel values, p1 and p2 - B_BYTE(); + B_BYTE(); B_BYTE(); } else if (cmd >= 0x51 && cmd <= 0x57) { // Output pixel at relative position -m, then absolute pixel value p diff --git a/engines/mohawk/file.cpp b/engines/mohawk/file.cpp index bca9ef6008..feeffd042b 100644 --- a/engines/mohawk/file.cpp +++ b/engines/mohawk/file.cpp @@ -106,7 +106,7 @@ void MohawkFile::open(Common::SeekableReadStream *stream) { debug (3, "Resources = %04x", _types[i].resTable.resources); _types[i].resTable.entries = new Type::ResourceTable::Entries[_types[i].resTable.resources]; - + for (uint16 j = 0; j < _types[i].resTable.resources; j++) { _types[i].resTable.entries[j].id = _mhk->readUint16BE(); _types[i].resTable.entries[j].index = _mhk->readUint16BE(); @@ -121,7 +121,7 @@ void MohawkFile::open(Common::SeekableReadStream *stream) { debug (3, "Names = %04x", _types[i].nameTable.num); _types[i].nameTable.entries = new Type::NameTable::Entries[_types[i].nameTable.num]; - + for (uint16 j = 0; j < _types[i].nameTable.num; j++) { _types[i].nameTable.entries[j].offset = _mhk->readUint16BE(); _types[i].nameTable.entries[j].index = _mhk->readUint16BE(); @@ -152,7 +152,7 @@ void MohawkFile::open(Common::SeekableReadStream *stream) { _mhk->seek(_rsrc.abs_offset + _rsrc.file_table_offset); _fileTableAmount = _mhk->readUint32BE(); _fileTable = new FileTable[_fileTableAmount]; - + for (uint32 i = 0; i < _fileTableAmount; i++) { _fileTable[i].offset = _mhk->readUint32BE(); _fileTable[i].dataSize = _mhk->readUint16BE(); diff --git a/engines/mohawk/myst_scripts.h b/engines/mohawk/myst_scripts.h index 39986a3db2..16b9a900d3 100644 --- a/engines/mohawk/myst_scripts.h +++ b/engines/mohawk/myst_scripts.h @@ -178,31 +178,31 @@ private: DECLARE_OPCODE(opcode_198); DECLARE_OPCODE(opcode_199); - DECLARE_OPCODE(opcode_200); - DECLARE_OPCODE(opcode_201); - DECLARE_OPCODE(opcode_202); - DECLARE_OPCODE(opcode_203); - DECLARE_OPCODE(opcode_204); - DECLARE_OPCODE(opcode_205); - DECLARE_OPCODE(opcode_206); - DECLARE_OPCODE(opcode_207); - DECLARE_OPCODE(opcode_208); - DECLARE_OPCODE(opcode_209); - DECLARE_OPCODE(opcode_210); - DECLARE_OPCODE(opcode_211); - DECLARE_OPCODE(opcode_212); - DECLARE_OPCODE(opcode_213); - DECLARE_OPCODE(opcode_214); - DECLARE_OPCODE(opcode_215); - DECLARE_OPCODE(opcode_216); - DECLARE_OPCODE(opcode_217); - DECLARE_OPCODE(opcode_218); - DECLARE_OPCODE(opcode_219); - DECLARE_OPCODE(opcode_220); - DECLARE_OPCODE(opcode_221); - DECLARE_OPCODE(opcode_222); - DECLARE_OPCODE(opcode_298); - DECLARE_OPCODE(opcode_299); + DECLARE_OPCODE(opcode_200); + DECLARE_OPCODE(opcode_201); + DECLARE_OPCODE(opcode_202); + DECLARE_OPCODE(opcode_203); + DECLARE_OPCODE(opcode_204); + DECLARE_OPCODE(opcode_205); + DECLARE_OPCODE(opcode_206); + DECLARE_OPCODE(opcode_207); + DECLARE_OPCODE(opcode_208); + DECLARE_OPCODE(opcode_209); + DECLARE_OPCODE(opcode_210); + DECLARE_OPCODE(opcode_211); + DECLARE_OPCODE(opcode_212); + DECLARE_OPCODE(opcode_213); + DECLARE_OPCODE(opcode_214); + DECLARE_OPCODE(opcode_215); + DECLARE_OPCODE(opcode_216); + DECLARE_OPCODE(opcode_217); + DECLARE_OPCODE(opcode_218); + DECLARE_OPCODE(opcode_219); + DECLARE_OPCODE(opcode_220); + DECLARE_OPCODE(opcode_221); + DECLARE_OPCODE(opcode_222); + DECLARE_OPCODE(opcode_298); + DECLARE_OPCODE(opcode_299); DECLARE_OPCODE(opcode_300); DECLARE_OPCODE(opcode_301); diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index 2c24812826..0d76a3643c 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -85,7 +85,7 @@ void Sound::initMidi() { _midiParser->setMidiDriver(_midiDriver); _midiParser->setTimerRate(_midiDriver->getBaseTempo()); } - + Audio::SoundHandle *Sound::playSound(uint16 id, bool mainSoundFile, byte volume) { debug (0, "Playing sound %d", id); diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h index 44c4409b0c..07c0581843 100644 --- a/engines/mohawk/sound.h +++ b/engines/mohawk/sound.h @@ -131,7 +131,7 @@ public: void pauseSLST(); void resumeSLST(); void stopAllSLST(); - + private: MohawkEngine *_vm; MohawkFile *_rivenSoundFile; |