From 36fb4559e5eb8bb63e030c48629194a68cea2376 Mon Sep 17 00:00:00 2001 From: avolkov Date: Tue, 17 May 2011 18:58:06 +0000 Subject: [PATCH] Fix alien comm flickers when using number speech and other spliced pieces git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3615 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/libs/sound/trackplayer.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sc2/src/libs/sound/trackplayer.c b/sc2/src/libs/sound/trackplayer.c index 11417117a..3006cc5fe 100644 --- a/sc2/src/libs/sound/trackplayer.c +++ b/sc2/src/libs/sound/trackplayer.c @@ -393,6 +393,7 @@ SpliceMultiTrack (UNICODE *TrackNames[], UNICODE *TrackText) chunks_tail->next = create_SoundChunk (track_decs[tracks], sound_sample->length); chunks_tail = chunks_tail->next; + chunks_tail->track_num = track_count - 1; sound_sample->length += track_decs[tracks]->length; } else @@ -580,10 +581,10 @@ SpliceTrack (UNICODE *TrackName, UNICODE *TrackText, UNICODE *TimeStamp, TFB_Tra dec_offset, time_stamps[page]); #endif sound_sample->length += decoder->length; + chunks_tail->track_num = track_count - 1; if (!no_page_break) { chunks_tail->tag_me = 1; - chunks_tail->track_num = track_count - 1; if (page < num_pages) { chunks_tail->text = pages[page]; @@ -773,12 +774,9 @@ TFB_SoundChunk * create_SoundChunk (TFB_SoundDecoder *decoder, float start_time) { TFB_SoundChunk *chunk; - chunk = HMalloc (sizeof (TFB_SoundChunk)); + chunk = HCalloc (sizeof (*chunk)); chunk->decoder = decoder; - chunk->next = NULL; chunk->start_time = start_time; - chunk->tag_me = 0; - chunk->text = 0; return chunk; }