From 1cebbd9ed226951cc52aac1b2a7c5199de6baea6 Mon Sep 17 00:00:00 2001 From: gewlitys Date: Mon, 21 Apr 2003 13:57:25 +0000 Subject: [PATCH] Reverted chmmravatar's fixes for #272 and #311 because of lockup issues git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@922 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 -- sc2/src/sc2code/comm.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 9e29fbacc..6fb97216a 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -7,8 +7,6 @@ Changes towards version 0.3: - Subtitles are now hidden after alien has finished talking (bug #312), from chmmravatar - 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 (partial fix for bug #309), from chmmravatar - Added PC-style conversation summaries (bug #310), from chmmravatar diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c index 13855234f..52b0f2e28 100644 --- a/sc2/src/sc2code/comm.c +++ b/sc2/src/sc2code/comm.c @@ -1573,7 +1573,6 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES) FadeMusic (BACKGROUND_VOL, ONE_SECOND); - CommData.AlienTalkDesc.AnimFlags &= ~PAUSE_TALKING; CommData.AlienTransitionDesc.AnimFlags &= ~(TALK_INTRO | TALK_DONE); pES->num_responses = 0; (*pES->response_list[pES->cur_response].response_func) @@ -1735,10 +1734,7 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES) SetSemaphore (GraphicsSem); FeedbackPlayerPhrase (pES->phrase_buf); - CommData.AlienTalkDesc.AnimFlags &= ~PAUSE_TALKING; - CommData.AlienTalkDesc.AnimFlags |= WAIT_TALKING; SpewPhrases (0); - CommData.AlienTalkDesc.AnimFlags |= PAUSE_TALKING; if (!(GLOBAL (CurrentActivity) & CHECK_ABORT)) { RefreshResponses (pES);