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

More fixes from Hibernatus

Browse Source 
svn-id: r8792
This commit is contained in:
Travis Howell 2003-07-06 06:36:26 +00:00
parent 5f3d4c3435
commit 817d600d8e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scumm/script_v5.cpp
View File

@ -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.

2
sound/mixer.cpp
View File

@ -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;
}