diff options
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/sfx/player/player.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/sfx/player/polled.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 7cd39d3c7e..74a62da356 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -1042,7 +1042,7 @@ reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) { if (audioRes) { audioStream = Audio::makeLinearInputStream(audioRes->data, audioRes->size, _audioRate, Audio::Mixer::FLAG_UNSIGNED, 0, 0); - sampleLen = audioRes->size * 60 / _audioRate; + sampleLen = audioRes->size * 60 / _audioRate; } else { // No patch file found, read it from the audio volume byte volume; @@ -1057,8 +1057,8 @@ reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) { sprintf(filename, "AUDIO%03d.%03d", _lang, volume); // Try to load compressed - audioStream = Audio::AudioStream::openStreamFile(filename, start, duration); - if (!audioStream) { + audioStream = Audio::AudioStream::openStreamFile(filename, start, duration); + if (!audioStream) { // Compressed file load failed, try to load original raw data byte *soundbuff = (byte *)malloc(size); Common::File* audioFile = new Common::File(); @@ -1094,7 +1094,7 @@ reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) { case kSci1AudioPosition: if (mixer->isSoundHandleActive(_audioHandle)) { return make_reg(0, mixer->getSoundElapsedTime(_audioHandle) * 6 / 100); // return elapsed time in ticks - } else { + } else { return make_reg(0, -1); // Sound finished } case kSci1AudioRate: diff --git a/engines/sci/sfx/player/player.cpp b/engines/sci/sfx/player/player.cpp index 2336978743..5c811f8ab8 100644 --- a/engines/sci/sfx/player/player.cpp +++ b/engines/sci/sfx/player/player.cpp @@ -91,8 +91,8 @@ static void play_song(SongIterator *it) { } static void player_tell_synth(int buf_nr, byte *buf) { - byte op1 = (buf_nr < 2 ? 0 : buf[1]); - byte op2 = (buf_nr < 3 ? 0 : buf[2]); + byte op1 = (buf_nr < 2 ? 0 : buf[1]); + byte op2 = (buf_nr < 3 ? 0 : buf[2]); static_cast<MidiDriver *>(mididrv)->send(buf[0], op1, op2); } diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp index 27d0f88ffe..842b7c5df5 100644 --- a/engines/sci/sfx/player/polled.cpp +++ b/engines/sci/sfx/player/polled.cpp @@ -99,7 +99,7 @@ protected: void PolledPlayerAudioStream::queryTimestamp() { Audio::Timestamp stamp; - + if (!new_song) { _mode = FEED_MODE_IDLE; } else { |