Ticket #1289: simon_voice_hack.diff

scummvm/simon/simon.cpp

@@ -4746 +4746 @@
 
         _rnd.getRandomNumber(2);
 
+        _sound->pollVoice();
+
         do {
                 while (!_in_callback && cur >= _last_vga_tick + vga_period) {
                         _last_vga_tick += vga_period;

scummvm/simon/sound.cpp

@@ -399 +399 @@
         _voice = new RawSound(_mixer, file, 0, SOUND_BIG_ENDIAN);
 }
 
+#define VOICE_QUEUE_ENTRIES 10
+
+static int pendingVoices = 0;
+static uint voiceQueue[VOICE_QUEUE_ENTRIES];
+
 void SimonSound::playVoice(uint sound) {
+        if (pendingVoices >= VOICE_QUEUE_ENTRIES) {
+                warning("Voice queue overflow");
+                return;
+        }
+
+        voiceQueue[pendingVoices++] = sound;
+}
+
+void SimonSound::pollVoice() {
+        if (_voice_handle || pendingVoices == 0)
+                return;
+
+        uint sound = voiceQueue[0];
+        pendingVoices--;
+
+        for (int i = 0; i < pendingVoices; i++)
+                voiceQueue[i] = voiceQueue[i + 1];
+
         if (_game == GAME_SIMON2MAC && _filenums) {
                 stopAll();
 

scummvm/simon/sound.h

@@ -63 +63 @@
         void readVoiceFile(const char *filename, const Common::String &gameDataPath);
 
         void playVoice(uint sound);
+        void pollVoice();
         void playEffects(uint sound);
         void playAmbient(uint sound);