From 986902129467f9b0603a08463c286c6412f682c6 Mon Sep 17 00:00:00 2001 From: ghaushe Date: Wed, 22 Jan 2003 02:50:41 +0000 Subject: [PATCH] Fixed overlapping subtitles when changing tracks git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@572 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/TODO | 3 --- sc2/src/sc2code/libs/sound/openal/trackplayer.c | 1 + sc2/src/sc2code/libs/sound/sdl/trackplayer.c | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 2f1698d85..2b4a410f2 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.2: +- Fixed overlapping subtitle text while switch tracks -PhracturedBlue - New flash-thread cacheing scheme - PhracturedBlue - Voice-over / subtitle synch is done - PhracturedBlue - Optimized DCQ to be much smaller and faster diff --git a/sc2/TODO b/sc2/TODO index b6e9f8a4e..c49e33545 100644 --- a/sc2/TODO +++ b/sc2/TODO @@ -58,7 +58,6 @@ Glitches (don't crash the game, medium priority): - "device used successfully" and "device usage failed" sounds are identical (the failure one) - 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 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. @@ -133,8 +132,6 @@ Stuff still to do (large): Some packaging will be used. (possibilities: zlib, physfs (http://icculus.org/physfs/), zziplib (http://zziplib.sourceforge.net/)) (assigned to Meep-Eep) -- currently the subtitles sometimes overlap - (depends on new resource system) - add some way to configure the PC/3DO/other choices. - music should be selectable track by track (depends on new resource system) diff --git a/sc2/src/sc2code/libs/sound/openal/trackplayer.c b/sc2/src/sc2code/libs/sound/openal/trackplayer.c index 2ab230cfc..7b0c3a3ed 100644 --- a/sc2/src/sc2code/libs/sound/openal/trackplayer.c +++ b/sc2/src/sc2code/libs/sound/openal/trackplayer.c @@ -69,6 +69,7 @@ advance_track (int channel_finished) PlayStream (track_clip[tcur].sample, SPEECH_SOURCE, AL_FALSE, speechVolumeScale == 0.0f ? AL_FALSE : AL_TRUE); UnlockMutex (soundSource[SPEECH_SOURCE].stream_mutex); + do_subtitles (~0, 0); do_subtitles (0, 0); } else if (channel_finished == 0) diff --git a/sc2/src/sc2code/libs/sound/sdl/trackplayer.c b/sc2/src/sc2code/libs/sound/sdl/trackplayer.c index a8e3a8096..dfe7653a8 100644 --- a/sc2/src/sc2code/libs/sound/sdl/trackplayer.c +++ b/sc2/src/sc2code/libs/sound/sdl/trackplayer.c @@ -64,6 +64,7 @@ advance_track (int channel_finished) if (tcur < tct) { Mix_PlayChannel (VOICE_CHANNEL, track_clip[tcur].chunk, 0); + do_subtitles (~0, 0); do_subtitles (0, 0); } else if (channel_finished == VOICE_CHANNEL)