Ticket #3590: 1876741.diff

queen/resource.cpp

@@ -106 +106 @@
                         re = &_resourceTable[cur];
                         break;
                 }
-        } while (cur++ < _resourceEntries);
+        } while (++cur < _resourceEntries);
 #endif
         return re;
 }

queen/sound.cpp

@@ -40 +40 @@
 #include "sound/mp3.h"
 #include "sound/vorbis.h"
 
-#define SB_HEADER_SIZE_V104 110
-#define SB_HEADER_SIZE_V110 122
-
 namespace Queen {
 
 class SilentSound : public PCSound {
@@ -254 +251 @@
         }
 }
 
+int parseHeaderSB(Common::File *f, int soundIndex, uint32 &size) {
+        static const int freqTable[] = {
+                 3951,  4186,  4435,  4699,  4978,  5274,  5588,  5920,  6272,  6645,  7040,
+                 7459,  7902,  8372,  8870,  9397,  9956, 10548, 11175, 11840, 12544, 13290,
+                14080, 14917, 15804, 16744, 17740, 18795, 19912, 21096, 22351, 23680, 25088
+        };
+        const int fileBaseOffset = f->pos();
+
+        f->readUint16LE(); // number of sound indexes
+        const int fileInfoOffset = f->readUint16LE();
+        f->seek(soundIndex * 4, SEEK_CUR);
+        const int soundSetupInfoOffset = f->readUint16LE();
+
+        f->seek(fileBaseOffset + soundSetupInfoOffset, SEEK_SET);
+        int frequency = 11025; // default to 'sane' values
+        int pcmDataOffsetIndex = 0;
+        while (true) {
+                uint8 opcode = f->readByte();
+                if (opcode >= 32) {
+                        frequency = freqTable[(opcode - 32) / 2];
+                        break;
+                }
+                switch (opcode) {
+                case 0:
+                        f->readByte();
+                        break;
+                case 7:
+                        pcmDataOffsetIndex = f->readByte();
+                        break;
+                default:
+                        error("Invalid opcode %d in SB file header", opcode);
+                        break;
+                }
+        }
+
+        f->seek(fileBaseOffset + fileInfoOffset + pcmDataOffsetIndex, SEEK_SET);
+        int pcmDataOffset = f->readUint16LE();
+        pcmDataOffset |= f->readUint16LE() << 4;
+        size -= pcmDataOffset;
+        f->seek(fileBaseOffset + pcmDataOffset, SEEK_SET);
+        return frequency;
+}
+
 void SBSound::playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
-        int headerSize;
-        f->seek(2, SEEK_CUR);
-        uint16 version = f->readUint16LE();
-        switch (version) {
-        case 104:
-                headerSize = SB_HEADER_SIZE_V104;
-                break;
-        case 110:
-                headerSize = SB_HEADER_SIZE_V110;
-                break;
-        default:
-                warning("Unhandled SB file version %d, defaulting to 104\n", version);
-                headerSize = SB_HEADER_SIZE_V104;
-                break;
-        }
-        f->seek(headerSize - 4, SEEK_CUR);
-        size -= headerSize;
+        const int frequency = parseHeaderSB(f, 18, size);
         uint8 *sound = (uint8 *)malloc(size);
         if (sound) {
                 f->read(sound, size);
                 byte flags = Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE;
-                _mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, 11025, flags);
+                _mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, frequency, flags);
         }
 }