diff options
| author | Norbert Lange | 2009-06-30 17:41:24 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-06-30 17:41:24 +0000 |
| commit | e3a5da7b7ed1581e31b47dceabddb46f49b29cd7 (patch) | |
| tree | 61b00799ab74383ec024a7b345d9506c35863b17 /engines/scumm/sound.cpp | |
| parent | cf351dffe6f91e43496080aba2b9df51aa10f061 (diff) | |
| download | scummvm-rg350-e3a5da7b7ed1581e31b47dceabddb46f49b29cd7.tar.gz scummvm-rg350-e3a5da7b7ed1581e31b47dceabddb46f49b29cd7.tar.bz2 scummvm-rg350-e3a5da7b7ed1581e31b47dceabddb46f49b29cd7.zip | |
engines/scumm/*: enabled choosing of the colorpalette, by setting RenderMode to EGA the "old" palette will be used
tfmx/tfmxplayer.cpp: removed some unused stuff
sound/mods/tfmx.cpp: emulating the way MI initialises new macro-programms. (Difference might not be audible at all)
svn-id: r41976
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 0932882591..970b3970b6 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -440,27 +440,6 @@ void Sound::playSound(int soundID) { if (_vm->_game.id == GID_MONKEY_VGA || _vm->_game.id == GID_MONKEY_EGA || (_vm->_game.id == GID_MONKEY && _vm->_game.platform == Common::kPlatformMacintosh)) { - // Sound is currently not supported at all in the amiga versions of these games - if (_vm->_game.platform == Common::kPlatformAmiga && false) { - - int track = -1; - if (soundID == 50) - track = 17; - else if (ptr[6] == 0x7F && ptr[7] == 0x00 && ptr[8] == 0x80) { - static const char tracks[16] = {13,14,10,3,4,9,16,5,1,8,2,15,6,7,11,12}; - if (ptr[9] == 0x0E) - track = 18; - else - track = tracks[ptr[9] - 0x23]; - } - if (track != -1) { - playCDTrack(track,((track < 5) || (track > 16)) ? 1 : -1,0,0); - stopCDTimer(); - _currentCDSound = soundID; - } - return; - } - // Works around the fact that in some places in MonkeyEGA/VGA, // the music is never explicitly stopped. // Rather it seems that starting a new music is supposed to |