diff options
| -rw-r--r-- | engines/gob/save/savefile.h | 2 | ||||
| -rw-r--r-- | engines/gob/save/saveload.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/save/saveload_v3.cpp | 8 | ||||
| -rw-r--r-- | engines/gob/save/saveload_v4.cpp | 6 | ||||
| -rw-r--r-- | engines/gob/sound/adlib.cpp | 18 |
5 files changed, 18 insertions, 18 deletions
diff --git a/engines/gob/save/savefile.h b/engines/gob/save/savefile.h index 989a37277e..615be8e0f2 100644 --- a/engines/gob/save/savefile.h +++ b/engines/gob/save/savefile.h @@ -163,7 +163,7 @@ public: bool readPalette(const byte *palette); /** Read a sprite into the part. */ bool readSprite(const SurfaceDesc &sprite); - + /** Read size bytes of raw data into the sprite. */ bool readSpriteRaw(const byte *data, uint32 size); diff --git a/engines/gob/save/saveload.cpp b/engines/gob/save/saveload.cpp index abda2f8a65..81239f07dc 100644 --- a/engines/gob/save/saveload.cpp +++ b/engines/gob/save/saveload.cpp @@ -61,7 +61,7 @@ int32 SaveLoad::getSize(const char *fileName) { int32 size = handler->getSize(); debugC(4, kDebugSaveLoad, "Size is %d", size); - + return size; } diff --git a/engines/gob/save/saveload_v3.cpp b/engines/gob/save/saveload_v3.cpp index 2f89644ee0..58232e6991 100644 --- a/engines/gob/save/saveload_v3.cpp +++ b/engines/gob/save/saveload_v3.cpp @@ -302,7 +302,7 @@ bool SaveLoad_v3::GameHandler::createReader(int slot) { if (!_reader || (_reader->getSlot() != ((uint32) slot))) { Common::String slotFile = _slotFile->build(slot); - + if (slotFile.empty()) return false; @@ -319,7 +319,7 @@ bool SaveLoad_v3::GameHandler::createReader(int slot) { } else _reader = new SaveReader(_usesScreenshots ? 3 : 2, slot, slotFile); - + if (!_reader->load()) { delete _reader; _reader = 0; @@ -337,7 +337,7 @@ bool SaveLoad_v3::GameHandler::createWriter(int slot) { if (!_writer || (_writer->getSlot() != ((uint32) slot))) { Common::String slotFile = _slotFile->build(slot); - + if (slotFile.empty()) return false; @@ -495,7 +495,7 @@ SaveLoad_v3::SaveLoad_v3(GobEngine *vm, const char *targetName, ScreenshotType s _gameHandler = new GameHandler(vm, targetName, true); _screenshotHandler = new ScreenshotHandler(vm, _gameHandler, sShotType); } - + _tempSpriteHandler = new TempSpriteHandler(vm); _notesHandler = new NotesHandler(2560, vm, targetName); diff --git a/engines/gob/save/saveload_v4.cpp b/engines/gob/save/saveload_v4.cpp index 6e1d5208ff..06280af2a6 100644 --- a/engines/gob/save/saveload_v4.cpp +++ b/engines/gob/save/saveload_v4.cpp @@ -317,7 +317,7 @@ bool SaveLoad_v4::GameHandler::createReader(int slot) { if (!_reader || (_reader->getSlot() != ((uint32) slot))) { Common::String slotFile = _slotFile->build(slot); - + if (slotFile.empty()) return false; @@ -334,7 +334,7 @@ bool SaveLoad_v4::GameHandler::createReader(int slot) { } else _reader = new SaveReader(3, slot, slotFile); - + if (!_reader->load()) { delete _reader; _reader = 0; @@ -352,7 +352,7 @@ bool SaveLoad_v4::GameHandler::createWriter(int slot) { if (!_writer || (_writer->getSlot() != ((uint32) slot))) { Common::String slotFile = _slotFile->build(slot); - + if (slotFile.empty()) return false; diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp index bb8bb86479..b4543dec6f 100644 --- a/engines/gob/sound/adlib.cpp +++ b/engines/gob/sound/adlib.cpp @@ -66,7 +66,7 @@ void AdLib::init() { _playing = false; _freeData = false; - + _repCount = -1; _samplesTillPoll = 0; @@ -356,11 +356,11 @@ void ADLPlayer::interpret() { tempo = ((tempo & 3) << 8) | *(_playPos++); } _first = false; - + // Instruction instr = *(_playPos++); channel = instr & 0x0F; - + switch (instr & 0xF0) { // Note on + Volume case 0x00: @@ -416,7 +416,7 @@ void ADLPlayer::interpret() { _ended = true; break; } - + // Temporization tempo = *(_playPos++); // End tempo @@ -429,7 +429,7 @@ void ADLPlayer::interpret() { tempo = ((tempo & 3) << 8) | *(_playPos++); if (!tempo) tempo ++; - + _samplesTillPoll = tempo * (_rate / 1000); } @@ -544,7 +544,7 @@ bool MDYPlayer::loadMDY(const char *fileName) { return loaded; } -bool MDYPlayer::loadTBR(Common::SeekableReadStream &stream) { +bool MDYPlayer::loadTBR(Common::SeekableReadStream &stream) { unloadTBR(); _timbresSize = stream.size(); @@ -600,7 +600,7 @@ void MDYPlayer::interpret() { byte volume; uint8 tempoMult, tempoFrac; uint8 ctrlByte1, ctrlByte2; - uint8 timbre; + uint8 timbre; if (_first) { for (int i = 0; i < 11; i ++) @@ -666,7 +666,7 @@ void MDYPlayer::interpret() { break; case 0xE0: warning("Pitch bend not yet implemented"); - + note = *(_playPos)++; note += (unsigned)(*(_playPos++)) << 7; @@ -748,7 +748,7 @@ void MDYPlayer::setVoice(byte voice, byte instr, bool set) { for (int j = 0; j < 9; j++) timbreName[j] = _timbres[6 + j + (instr * 9)]; debugC(6, kDebugSound, "Loading timbre %s", timbreName); - + // i = 0 : 0 1 2 3 4 5 6 7 8 9 10 11 12 26 // i = 1 : 13 14 15 16 17 18 19 20 21 22 23 24 25 27 for (int i = 0; i < 2; i++) { |