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

Fixed crash in conversation summary and ffw/frew problem when selling

Browse Source 
data to Melnorme (bug #476), from chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1227 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-09-13 15:08:51 +00:00
parent 3358c8e571
commit 50a80d6f63
4 changed files with 6 additions and 2 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.4:
- Fixed crash in conversation summary and ffw/frew problem when
selling data to Melnorme (bug #476), from chmmravatar
- Flush input after selecting "Navigate" (bug #475) - Michael
- Fixed ships in solar system getting displaced after having
visited a planet (bug #365) -Alex
sc2/src/sc2code/comm.c
+2
View File
@@ -1704,6 +1704,8 @@ DoCommunication (PENCOUNTER_STATE pES)
for (curr = first_chain; curr != NULL; curr = curr->next)
{
temp = curr->tag.data;
if (temp == NULL)
break;
// fprintf (stderr, "%s\n", temp);
while (wstrlen (temp) > (unsigned int) SUMMARY_CHARS
&& !(GLOBAL (CurrentActivity) & CHECK_ABORT))
sc2/src/sc2code/libs/sound/sound.c
+1 -1
View File
@@ -152,7 +152,7 @@ get_previous_chain (TFB_SoundChain *first_chain, TFB_SoundChain *current_chain)
return (prev_chain);
while (prev_chain->next)
{
if (prev_chain->next == current_chain)
if (prev_chain->next == current_chain || !prev_chain->next->tag.data)
return (prev_chain);
prev_chain = prev_chain->next;
}
sc2/src/sc2code/libs/sound/trackplayer.c
+1 -1
View File
@@ -669,7 +669,7 @@ FastForward_Page ()
{
TFB_SoundChain *cur_ptr = sound_sample->play_chain_ptr;
LockMutex (soundSource[SPEECH_SOURCE].stream_mutex);
while (cur_ptr->next && ! cur_ptr->tag.type)
while (cur_ptr->next && ! cur_ptr->next->tag.type)
cur_ptr = cur_ptr->next;
if (cur_ptr->next)
{