From 3caf6010864600a659a8bf0114b463b94c45a50b Mon Sep 17 00:00:00 2001
From: gewlitys <gewlitys@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sun, 20 Apr 2003 14:13:30 +0000
Subject: [PATCH] Subtitles are now hidden after alien has finished talking
 (bug #312), from chmmravatar

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@915 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog          | 2 ++
 sc2/src/sc2code/comm.c | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 85ba0060e..a75996507 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,6 @@
 Changes towards version 0.3:
+- Subtitles are now hidden after alien has finished talking (bug #312),
+  from chmmravatar
 - Fix for mycon portrait (bug #183), from Nic
 - Fix glitch when rewinding after alien has stopped talking (bug #311),
   from chmmravatar
diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c
index 3d0315b94..d70981728 100644
--- a/sc2/src/sc2code/comm.c
+++ b/sc2/src/sc2code/comm.c
@@ -104,6 +104,7 @@ enum
 };
 static int subtitle_state = DONE_SUBTITLE;
 static Mutex subtitle_mutex;
+int do_subtitles (UNICODE *pStr);
 
 /* _count_lines - mostly stolen from add_text, just sees how many lines
                   a given input string would take to display given the
@@ -1322,6 +1323,7 @@ SpewPhrases (COUNT wait_track)
 			SetSliderImage (SetAbsFrameIndex (ActivityFrame, 8));
 			JumpTrack ();
 			CommData.AlienFrame = F;
+			do_subtitles ((void *)~0);
 			return (FALSE);
 		}
 
@@ -1374,6 +1376,7 @@ Rewind:
 			|| ((which_track = PlayingTrack ()) && which_track <= wait_track));
 
 	CommData.AlienFrame = F;
+	do_subtitles ((void *)~0);
 
 	if (wait_track == (COUNT)~0)
 		SetSliderImage (SetAbsFrameIndex (ActivityFrame, 8));