Engine: fix character speech text reacting to non-blocking voice-over

Not only PlayVoiceClip could be unrelated to the text, but it could have been run for a different character!

Author: ivan-mogilko

Engine/ac/characterinfo_engine.cpp

@@ -340,7 +340,7 @@ bool UpdateCharacterAnimating(CharacterInfo *chi, CharacterExtras *chex, int &do
         bool done_anim = false;
         if ((chi->index_id == char_speaking_anim) &&
             (play.speech_in_post_state ||
-            ((!play.speech_has_voice) &&
+            ((!play.speech_voice_blocking) &&
                 (play.close_mouth_speech_time > 0) &&
                 (play.messagetime < play.close_mouth_speech_time)))) {
             // finished talking - stop animation

Engine/ac/display.cpp

@@ -105,8 +105,8 @@ class DisplayMessageState : public GameState
 
         _timer--;
 
-        // Special behavior when coupled with a voice-over
-        if (play.speech_has_voice) {
+        // Special behavior when coupled with a blocking voice-over
+        if (play.speech_voice_blocking) {
             // extend life of text if the voice hasn't finished yet
             if (AudioChans::ChannelIsPlaying(SCHAN_SPEECH) && (play.fast_forward == 0)) {
                 if (_timer <= 1)

Engine/main/update.cpp

@@ -324,7 +324,7 @@ void update_overlay_timers()
 void update_speech_and_messages()
 {
   bool is_voice_playing = false;
-  if (play.speech_has_voice)
+  if (play.speech_voice_blocking)
   {
       auto *ch = AudioChans::GetChannel(SCHAN_SPEECH);
       is_voice_playing = ch && ch->is_ready();
@@ -333,7 +333,7 @@ void update_speech_and_messages()
   if (play.messagetime>=0) {
     play.messagetime--;
     // extend life of text if the voice hasn't finished yet
-    if (play.speech_has_voice && !play.speech_in_post_state) {
+    if (play.speech_voice_blocking && !play.speech_in_post_state) {
       if ((is_voice_playing) && (play.fast_forward == 0)) {
         if (play.messagetime <= 1)
           play.messagetime = 1;
@@ -371,7 +371,7 @@ void update_speech_and_messages()
 
 bool has_voice_lipsync()
 {
-    return play.speech_has_voice && (curLipLine >= 0);
+    return play.speech_voice_blocking && (curLipLine >= 0);
 }
 
 int update_voice_lipsync(int frame)
@@ -453,13 +453,13 @@ void update_sierra_speech()
              // if play.close_mouth_speech_time = 0, this means animation should play till
              // the speech ends; but this should not work in voice mode, and also if the
              // speech is in the "post" state
-             (play.speech_has_voice || play.speech_in_post_state || play.close_mouth_speech_time > 0))
+             (play.speech_voice_blocking || play.speech_in_post_state || play.close_mouth_speech_time > 0))
     { }
     else {
       // Close mouth at end of sentence: if speech has entered the "post" state,
       // or if this is a text only mode and close_mouth_speech_time is set
       if (play.speech_in_post_state ||
-          (!play.speech_has_voice &&
+          (!play.speech_voice_blocking &&
           (play.messagetime < play.close_mouth_speech_time) &&
           (play.close_mouth_speech_time > 0))) {
         facetalkframe = 0;
@@ -476,7 +476,7 @@ void update_sierra_speech()
         // normal non-lip-sync
         facetalkframe++;
         if ((facetalkframe >= views[facetalkview].loops[facetalkloop].numFrames) ||
-            (!play.speech_has_voice && (play.messagetime < 1) && (play.close_mouth_speech_time > 0))) {
+            (!play.speech_voice_blocking && (play.messagetime < 1) && (play.close_mouth_speech_time > 0))) {
 
           if ((facetalkframe >= views[facetalkview].loops[facetalkloop].numFrames) &&
               (views[facetalkview].loops[facetalkloop].RunNextLoop()))