diff options
| author | Travis Howell | 2005-10-20 14:08:35 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-10-20 14:08:35 +0000 |
| commit | 3fbfad767c60f5851849ba1352604f2d826fb333 (patch) | |
| tree | 55db3122e1bc3d74925a06c43251195c5ce9e835 /scumm | |
| parent | 6e6a2f3187c950132fed59ab8a698a44923f484a (diff) | |
| download | scummvm-rg350-3fbfad767c60f5851849ba1352604f2d826fb333.tar.gz scummvm-rg350-3fbfad767c60f5851849ba1352604f2d826fb333.tar.bz2 scummvm-rg350-3fbfad767c60f5851849ba1352604f2d826fb333.zip | |
-Allow no speech in HE games.
-Added extra XMIDI control change cases for HE61 games.
svn-id: r19193
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_player.cpp | 7 | ||||
| -rw-r--r-- | scumm/sound.cpp | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index ae19d38340..34937022b1 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -300,8 +300,11 @@ void Player::send(uint32 b) { case 93: // Chorus Level part->chorusLevel(param2); break; - case 116: // Unknown - // FIXME: Often used in puttmoon + case 116: // XMIDI For Loop. Not supported + // Used in the ending sequence of puttputt + break; + case 117: // XMIDI Next/Break. Not supported + // Used in the ending sequence of puttputt break; case 123: // All Notes Off part->allNotesOff(); diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 5126db41d8..326934da64 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -671,6 +671,9 @@ void Sound::startHETalkSound(uint32 offset) { byte *ptr; int32 size; + if (ConfMan.getBool("speech_mute")) + return; + if (!_sfxFile->isOpen()) { error("startHETalkSound: Speech file is not open"); return; |