Ticket #8380: speech.patch

queen/journal.cpp

@@ -247 +247 @@
                 }
                 drawConfigPanel();
         } else if (zoneNum == ZN_VOICE_TOGGLE) {
-                if (_vm->resource()->isCD())
-                        _vm->sound()->toggleSpeech();
-                else
-                        _vm->sound()->speechToggle(false);
+                _vm->sound()->toggleSpeech();
                 drawConfigPanel();
         } else if (zoneNum == ZN_TEXT_TOGGLE) {
                 _vm->subtitles(!_vm->subtitles());

queen/logic.cpp

@@ -1232 +1232 @@
                 // update screen scrolling
                 _vm->display()->horizontalScroll(mx);
 
-                // update bobs position / frame
+                // update Bob's position / frame
                 joe->x = piton->x = 3 * mx / 4 + 200;
                 joe->frameNum = mx / 36 + 45;
 

queen/queen.cpp

@@ -110 +110 @@
         ConfMan.registerDefault("music_mute", false);
         ConfMan.registerDefault("sfx_mute", false);
         ConfMan.registerDefault("talkspeed", Logic::DEFAULT_TALK_SPEED);
-        ConfMan.registerDefault("speech_mute", !_resource->isCD());
+        ConfMan.registerDefault("speech_mute", false);
         ConfMan.registerDefault("subtitles", true);
 }
 
@@ -133 +133 @@
         _sound->musicToggle(!ConfMan.getBool("music_mute"));
         _sound->sfxToggle(!ConfMan.getBool("sfx_mute"));
         _talkSpeed = ConfMan.getInt("talkspeed");
-        _sound->speechToggle(_resource->isCD() ? !ConfMan.getBool("speech_mute"): false);
+        _sound->speechToggle(!ConfMan.getBool("speech_mute"));
         _subtitles = ConfMan.getBool("subtitles");
         checkOptionSettings();
 }

queen/sound.cpp

@@ -103 +103 @@
 #endif
                 strcat(name, ".SB");
                 waitFinished(isSpeech);
-                sfxPlay(name, isSpeech);
+                if (_vm->resource()->fileExists(name)) {
+                        _lastSampleExists = true;
+                        sfxPlay(name, isSpeech);
+                } else {
+                        _lastSampleExists = false;
+                }
         }
 }
 
@@ -120 +125 @@
         }
         strcat(name, ".SB");
         waitFinished(isSpeech);
-        sfxPlay(name, isSpeech);
+        if (_vm->resource()->fileExists(name)) {
+                _lastSampleExists = true;
+                sfxPlay(name, isSpeech);
+        } else {
+                _lastSampleExists = false;
+        }
 }
 
 void Sound::playSong(int16 songNum) {
@@ -191 +201 @@
 
 #ifdef USE_MAD
 void MP3Sound::sfxPlay(const char *name, bool isSpeech) {
-        if (_vm->resource()->fileExists(name)) {
-                uint32 size;
-                File *f = _vm->resource()->giveCompressedSound(name, &size);
-                _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size), false);
-        }
+        uint32 size;
+        File *f = _vm->resource()->giveCompressedSound(name, &size);
+        _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size), false);
 }
 #endif
 
 #ifdef USE_VORBIS
 void OGGSound::sfxPlay(const char *name, bool isSpeech) {
-        if (_vm->resource()->fileExists(name)) {
-                uint32 size;
-                File *f = _vm->resource()->giveCompressedSound(name, &size);            
-                _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size), false);
-        }
+        uint32 size;
+        File *f = _vm->resource()->giveCompressedSound(name, &size);
+        _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size), false);
 }
 #endif
 
 #ifdef USE_FLAC
 void FLACSound::sfxPlay(const char *name, bool isSpeech) {
-        if (_vm->resource()->fileExists(name)) {
-                uint32 size;
-                File *f = _vm->resource()->giveCompressedSound(name, &size);            
-                _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size), false);
-        }
+        uint32 size;
+        File *f = _vm->resource()->giveCompressedSound(name, &size);
+        _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size), false);
 }
 #endif
 

queen/sound.h

@@ -53 +53 @@
 public:
         Sound(SoundMixer *mixer, QueenEngine *vm);
         virtual ~Sound(); 
-        virtual void sfxPlay(const char *name, bool isSpeech) = 0;
         static Sound *giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression);
         void playSfx(uint16 sfx, bool isSpeech);
         void playSfx(const char *base, bool isSpeech);
@@ -76 +75 @@
 
         bool isSpeechActive() const     { return _speechHandle.isActive(); }
         bool isSfxActive() const        { return _sfxHandle.isActive(); }
-        
+        bool lastSampleExists() const   { return _lastSampleExists; }        
+
         int16 lastOverride() const      { return _lastOverride; }
 
         void saveState(byte *&ptr);
@@ -107 +107 @@
         bool _sfxToggle;
         bool _speechToggle;
         bool _musicToggle;
+        bool _lastSampleExists;
         
         int16 _lastOverride;
         PlayingSoundHandle _sfxHandle;
         PlayingSoundHandle _speechHandle;
+
+private:
+        virtual void sfxPlay(const char *name, bool isSpeech) = 0;
 };
 
 class SilentSound : public Sound {

queen/talk.cpp

@@ -757 +757 @@
                                 break;
                         }
                         
-                        if (_vm->sound()->speechOn()) {
+                        if (_vm->sound()->speechOn() && _vm->sound()->lastSampleExists()) {
                                 // sfx is finished, stop the speak animation
                                 if (!_vm->sound()->isSpeechActive()) {
                                         break;
@@ -772 +772 @@
                 }
         }
 
-        // Make sure that Person closes their mouths
+        // Make sure that Person closes their mouth
         if (!isJoe && parameters->ff > 0)
                 _vm->bankMan()->overpack(parameters->ff, startFrame, bankNum);
 }
@@ -834 +834 @@
         if (!isJoe) {
                 if (SPEAK_AMAL_ON == command) {
                         // It's the oracle!
-                        // Dont turn AMAL animation off, and dont manually anim person
+                        // Don't turn AMAL animation off, and don't manually anim person
                         command = SPEAK_ORACLE;
                         oracle = true;
                         uint16 frameNum = _vm->graphics()->personFrames(bobNum);