adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Subtitles are now hidden after alien has finished talking (bug #312),

Browse Source 
from chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@915 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-04-20 14:13:30 +00:00
parent 5b8027b568
commit 3caf601086
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.3: 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 for mycon portrait (bug #183), from Nic
- Fix glitch when rewinding after alien has stopped talking (bug #311), - Fix glitch when rewinding after alien has stopped talking (bug #311),
from chmmravatar from chmmravatar
sc2/src/sc2code/comm.c
+3
View File
@@ -104,6 +104,7 @@ enum
}; };
static int subtitle_state = DONE_SUBTITLE; static int subtitle_state = DONE_SUBTITLE;
static Mutex subtitle_mutex; static Mutex subtitle_mutex;
int do_subtitles (UNICODE *pStr);
/* _count_lines - mostly stolen from add_text, just sees how many lines /* _count_lines - mostly stolen from add_text, just sees how many lines
a given input string would take to display given the a given input string would take to display given the
@@ -1322,6 +1323,7 @@ SpewPhrases (COUNT wait_track)
SetSliderImage (SetAbsFrameIndex (ActivityFrame, 8)); SetSliderImage (SetAbsFrameIndex (ActivityFrame, 8));
JumpTrack (); JumpTrack ();
CommData.AlienFrame = F; CommData.AlienFrame = F;
do_subtitles ((void *)~0);
return (FALSE); return (FALSE);
} }
@@ -1374,6 +1376,7 @@ Rewind:
|| ((which_track = PlayingTrack ()) && which_track <= wait_track)); || ((which_track = PlayingTrack ()) && which_track <= wait_track));
CommData.AlienFrame = F; CommData.AlienFrame = F;
do_subtitles ((void *)~0);
if (wait_track == (COUNT)~0) if (wait_track == (COUNT)~0)
SetSliderImage (SetAbsFrameIndex (ActivityFrame, 8)); SetSliderImage (SetAbsFrameIndex (ActivityFrame, 8));