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

Fix glitch and lockup in dialogs when rewinding (bugs #311 and #272),

Browse Source 
from chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@923 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-04-22 15:18:05 +00:00
parent 1cebbd9ed2
commit 32c5f2e155
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm.c
+35
View File
@@ -1164,6 +1164,10 @@ int ambient_anim_task(void* data)
TalkAlarm = FrameRate; TalkAlarm = FrameRate;
} }
} }
else if (done && (ADPtr->AnimFlags & PAUSE_TALKING))
{
ADPtr->AnimFlags &= ~(WAIT_TALKING | PAUSE_TALKING);
}
} }
if (!summary) if (!summary)
@@ -1734,7 +1738,35 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES)
SetSemaphore (GraphicsSem); SetSemaphore (GraphicsSem);
FeedbackPlayerPhrase (pES->phrase_buf); FeedbackPlayerPhrase (pES->phrase_buf);
CommData.AlienTransitionDesc.AnimFlags &= ~(TALK_INTRO | TALK_DONE);
if (CommData.AlienTalkDesc.NumFrames)
{
if (!(CommData.AlienTransitionDesc.AnimFlags & TALK_INTRO))
{
CommData.AlienTransitionDesc.AnimFlags |= TALK_INTRO;
if (CommData.AlienTransitionDesc.NumFrames)
CommData.AlienTalkDesc.AnimFlags |= TALK_INTRO;
}
CommData.AlienTransitionDesc.AnimFlags &= ~PAUSE_TALKING;
if (CommData.AlienTalkDesc.NumFrames)
CommData.AlienTalkDesc.AnimFlags |= WAIT_TALKING;
while (CommData.AlienTalkDesc.AnimFlags & TALK_INTRO)
{
ClearSemaphore (GraphicsSem);
TaskSwitch ();
SetSemaphore (GraphicsSem);
}
}
SpewPhrases (0); SpewPhrases (0);
CommData.AlienTransitionDesc.AnimFlags |= TALK_DONE;
if (CommData.AlienTalkDesc.NumFrames)
{
if ((CommData.AlienTalkDesc.AnimFlags & WAIT_TALKING))
CommData.AlienTalkDesc.AnimFlags |= PAUSE_TALKING;
}
if (!(GLOBAL (CurrentActivity) & CHECK_ABORT)) if (!(GLOBAL (CurrentActivity) & CHECK_ABORT))
{ {
RefreshResponses (pES); RefreshResponses (pES);
@@ -1744,6 +1776,9 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES)
FlushInput (); FlushInput ();
while (AnyButtonPress (TRUE)) while (AnyButtonPress (TRUE))
TaskSwitch (); TaskSwitch ();
do
TaskSwitch ();
while (CommData.AlienTalkDesc.AnimFlags & PAUSE_TALKING);
} }
else if (GetInputYComponent (InputState) < 0) else if (GetInputYComponent (InputState) < 0)
response = (BYTE)((response + (BYTE)(pES->num_responses - 1)) response = (BYTE)((response + (BYTE)(pES->num_responses - 1))