diff options
| author | Travis Howell | 2003-07-06 06:36:26 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-07-06 06:36:26 +0000 |
| commit | 817d600d8ef191e9bd8745f4eff23998b72f313d (patch) | |
| tree | 436fa448689ae9f1e633a92609dd4111e3c6c610 | |
| parent | 5f3d4c34356fc394624532e09e2f259631274c8e (diff) | |
| download | scummvm-rg350-817d600d8ef191e9bd8745f4eff23998b72f313d.tar.gz scummvm-rg350-817d600d8ef191e9bd8745f4eff23998b72f313d.tar.bz2 scummvm-rg350-817d600d8ef191e9bd8745f4eff23998b72f313d.zip | |
More fixes from Hibernatus
svn-id: r8792
| -rw-r--r-- | scumm/script_v5.cpp | 5 | ||||
| -rw-r--r-- | sound/mixer.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 6ef79b5d4c..61fcca6e4b 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -681,8 +681,7 @@ void Scumm_v5::o5_cursorCommand() { // Assuming this is correct, we might not actually need it, as our // initCharset automatically calls loadCharset for GF_SMALL_HEADER, if needed. // Loom ega at least does need this and v2 has its own cursor command - // so making this for OLD_BUNDLE. Going by disassembly zak256 does not have a - // sub op for this case, not sure about loomcd + // so making this for OLD_BUNDLE. } else { getWordVararg(table); for (i = 0; i < 16; i++) @@ -2023,7 +2022,7 @@ void Scumm_v5::o5_startMusic() { int result = 0; switch (b) { case 0: - result = _sound->pollCD() != 0; + result = _sound->pollCD() == 0; break; case 0xFC: // TODO: Unpause (resume) audio track. We'll have to extend Sound and OSystem for this. diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 0209851973..0a51d6dad2 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -231,7 +231,7 @@ int SoundMixer::playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, ui // Prevent duplicate sounds if (id != -1) { for (int i = 0; i != NUM_CHANNELS; i++) - if (_channels[i]->_id == id && _channels[i] != NULL) + if (_channels[i] != NULL && _channels[i]->_id == id) return -1; } |