diff -ur ScummVM-cvs20020813/scummvm/script_v1.cpp ScummVM-cvs20020813+hack/scummvm/script_v1.cpp
old
|
new
|
|
2712 | 2712 | delay = (int)((getVarOrDirectWord(0x40) & 0xffff) * 7.5); |
2713 | 2713 | if (_gameId == GID_LOOM256) { |
2714 | 2714 | _vars[VAR_MI1_TIMER] = 0; |
| 2715 | if (offset == 0 && delay == 0) { |
2715 | 2716 | #ifdef COMPRESSED_SOUND_FILE |
2716 | | if (playMP3CDTrack(1, 0, offset, delay) == -1) |
| 2717 | if (stopMP3CD() == -1) |
2717 | 2718 | #endif |
2718 | | _system->play_cdrom(1, 0, offset, delay); |
| 2719 | _system->stop_cdrom(); |
| 2720 | } else { |
| 2721 | #ifdef COMPRESSED_SOUND_FILE |
| 2722 | if (playMP3CDTrack(1, 0, offset, delay) == -1) |
| 2723 | #endif |
| 2724 | _system->play_cdrom(1, 0, offset, delay); |
| 2725 | } |
2719 | 2726 | } else { |
2720 | 2727 | warning("parseString: 8"); |
2721 | 2728 | } |
diff -ur ScummVM-cvs20020813/scummvm/sound.cpp ScummVM-cvs20020813+hack/scummvm/sound.cpp
old
|
new
|
|
510 | 510 | IMuse *se; |
511 | 511 | int i; |
512 | 512 | |
513 | | if (a == current_cd_sound) { |
| 513 | if (a != 0 && a == current_cd_sound) { |
514 | 514 | current_cd_sound = 0; |
515 | 515 | #ifdef COMPRESSED_SOUND_FILE |
516 | 516 | if (stopMP3CD() == -1) |