Ticket #8781: hofTownsAudioFix.patch

sound.cpp

@@ -469 +469 @@
         //      XXX
         //}
         
-        assert(command*2+1 < _trackMapSize);
-        if (_curMusicTheme != _trackMap[command*2]) {
-                if (_trackMap[command*2] != -1 && _trackMap[command*2] != -2)
-                        snd_playTheme(_trackMap[command*2]);
-        }
+        if (_flags.platform == Common::kPlatformPC) {
+                assert(command*2+1 < _trackMapSize);
+                if (_curMusicTheme != _trackMap[command*2]) {
+                        if (_trackMap[command*2] != -1 && _trackMap[command*2] != -2)
+                                snd_playTheme(_trackMap[command*2]);
+                }
 
-        if (command != 1) {
-                if (_lastMusicCommand != command) {
+                if (command != 1) {
+                        if (_lastMusicCommand != command) {
+                                _sound->haltTrack();
+                                _sound->playTrack(_trackMap[command*2+1]);
+                        }
+                } else {
+                        _sound->beginFadeOut();
+                }
+
+        } else if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
+                if (command == -1)
                         _sound->haltTrack();
-                        _sound->playTrack(_trackMap[command*2+1]);
+                if (_trackMap[command*2] == -2)
+                        return;
+                if (command != _lastMusicCommand) {
+                        _sound->haltTrack();
+                        _sound->playTrack(command);
                 }
-        } else {
-                _sound->beginFadeOut();
-        }
+        } 
 
         _lastMusicCommand = command;
 }