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

Reverted chmmravatar's fixes for #272 and #311 because of lockup issues

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@922 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-04-21 13:57:25 +00:00
parent 91c88caf59
commit 1cebbd9ed2
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
-2
View File
@@ -7,8 +7,6 @@ Changes towards version 0.3:
- Subtitles are now hidden after alien has finished talking (bug #312), - Subtitles are now hidden after alien has finished talking (bug #312),
from chmmravatar 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),
from chmmravatar
- Music levels no longer drop in conversations when using -T 0 - Music levels no longer drop in conversations when using -T 0
(partial fix for bug #309), from chmmravatar (partial fix for bug #309), from chmmravatar
- Added PC-style conversation summaries (bug #310), from chmmravatar - Added PC-style conversation summaries (bug #310), from chmmravatar
sc2/src/sc2code/comm.c
-4
View File
@@ -1573,7 +1573,6 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES)
FadeMusic (BACKGROUND_VOL, ONE_SECOND); FadeMusic (BACKGROUND_VOL, ONE_SECOND);
CommData.AlienTalkDesc.AnimFlags &= ~PAUSE_TALKING;
CommData.AlienTransitionDesc.AnimFlags &= ~(TALK_INTRO | TALK_DONE); CommData.AlienTransitionDesc.AnimFlags &= ~(TALK_INTRO | TALK_DONE);
pES->num_responses = 0; pES->num_responses = 0;
(*pES->response_list[pES->cur_response].response_func) (*pES->response_list[pES->cur_response].response_func)
@@ -1735,10 +1734,7 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES)
SetSemaphore (GraphicsSem); SetSemaphore (GraphicsSem);
FeedbackPlayerPhrase (pES->phrase_buf); FeedbackPlayerPhrase (pES->phrase_buf);
CommData.AlienTalkDesc.AnimFlags &= ~PAUSE_TALKING;
CommData.AlienTalkDesc.AnimFlags |= WAIT_TALKING;
SpewPhrases (0); SpewPhrases (0);
CommData.AlienTalkDesc.AnimFlags |= PAUSE_TALKING;
if (!(GLOBAL (CurrentActivity) & CHECK_ABORT)) if (!(GLOBAL (CurrentActivity) & CHECK_ABORT))
{ {
RefreshResponses (pES); RefreshResponses (pES);