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

Fixed overlapping subtitles when changing tracks

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@572 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
ghaushe
2003-01-22 02:50:41 +00:00
parent e69bc8e1db
commit 9869021294
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.2: Changes towards version 0.2:
- Fixed overlapping subtitle text while switch tracks -PhracturedBlue
- New flash-thread cacheing scheme - PhracturedBlue - New flash-thread cacheing scheme - PhracturedBlue
- Voice-over / subtitle synch is done - PhracturedBlue - Voice-over / subtitle synch is done - PhracturedBlue
- Optimized DCQ to be much smaller and faster - Optimized DCQ to be much smaller and faster
sc2/TODO
-3
View File
@@ -58,7 +58,6 @@ Glitches (don't crash the game, medium priority):
- "device used successfully" and "device usage failed" sounds are identical - "device used successfully" and "device usage failed" sounds are identical
(the failure one) (the failure one)
- spathi blink and other spathi animation may go out of sync - spathi blink and other spathi animation may go out of sync
- subtitles may go past the bottom boundary
- If you win a Melee, and then are blown up yourself, the sound loops - If you win a Melee, and then are blown up yourself, the sound loops
until the game is quit. It still functions, it just has the last 3-or-so until the game is quit. It still functions, it just has the last 3-or-so
seconds after the melee ended repeating over and over in the background. seconds after the melee ended repeating over and over in the background.
@@ -133,8 +132,6 @@ Stuff still to do (large):
Some packaging will be used. (possibilities: zlib, physfs Some packaging will be used. (possibilities: zlib, physfs
(http://icculus.org/physfs/), zziplib (http://zziplib.sourceforge.net/)) (http://icculus.org/physfs/), zziplib (http://zziplib.sourceforge.net/))
(assigned to Meep-Eep) (assigned to Meep-Eep)
- currently the subtitles sometimes overlap
(depends on new resource system)
- add some way to configure the PC/3DO/other choices. - add some way to configure the PC/3DO/other choices.
- music should be selectable track by track - music should be selectable track by track
(depends on new resource system) (depends on new resource system)
sc2/src/sc2code/libs/sound/openal/trackplayer.c
+1
View File
@@ -69,6 +69,7 @@ advance_track (int channel_finished)
PlayStream (track_clip[tcur].sample, SPEECH_SOURCE, AL_FALSE, PlayStream (track_clip[tcur].sample, SPEECH_SOURCE, AL_FALSE,
speechVolumeScale == 0.0f ? AL_FALSE : AL_TRUE); speechVolumeScale == 0.0f ? AL_FALSE : AL_TRUE);
UnlockMutex (soundSource[SPEECH_SOURCE].stream_mutex); UnlockMutex (soundSource[SPEECH_SOURCE].stream_mutex);
do_subtitles (~0, 0);
do_subtitles (0, 0); do_subtitles (0, 0);
} }
else if (channel_finished == 0) else if (channel_finished == 0)
sc2/src/sc2code/libs/sound/sdl/trackplayer.c
+1
View File
@@ -64,6 +64,7 @@ advance_track (int channel_finished)
if (tcur < tct) if (tcur < tct)
{ {
Mix_PlayChannel (VOICE_CHANNEL, track_clip[tcur].chunk, 0); Mix_PlayChannel (VOICE_CHANNEL, track_clip[tcur].chunk, 0);
do_subtitles (~0, 0);
do_subtitles (0, 0); do_subtitles (0, 0);
} }
else if (channel_finished == VOICE_CHANNEL) else if (channel_finished == VOICE_CHANNEL)