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

Fix glitch conversation summary caused to animations (bug #320), from

Browse Source 
chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@925 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-04-22 22:59:06 +00:00
parent 5ffa187e2d
commit a0b5d58073
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm.c
+3 -6
View File
@@ -388,8 +388,6 @@ DrawAlienFrame (FRAME aframe, PSEQUENCE pSeq)
COUNT i; COUNT i;
STAMP s; STAMP s;
ANIMATION_DESCPTR ADPtr; ANIMATION_DESCPTR ADPtr;
if (summary)
return;
s.origin.x = -SAFE_X; s.origin.x = -SAFE_X;
s.origin.y = 0; s.origin.y = 0;
@@ -885,7 +883,7 @@ int ambient_anim_task(void* data)
pSeq = &Sequencer[i]; pSeq = &Sequencer[i];
ADPtr = &CommData.AlienAmbientArray[i]; ADPtr = &CommData.AlienAmbientArray[i];
while (i-- && !Task_ReadState (task, TASK_EXIT) && !summary) while (i-- && !Task_ReadState (task, TASK_EXIT))
{ {
--ADPtr; --ADPtr;
--pSeq; --pSeq;
@@ -1023,8 +1021,7 @@ int ambient_anim_task(void* data)
if (CanTalk if (CanTalk
&& ADPtr->NumFrames && ADPtr->NumFrames
&& (ADPtr->AnimFlags & WAIT_TALKING) && (ADPtr->AnimFlags & WAIT_TALKING)
&& !(CommData.AlienTransitionDesc.AnimFlags & PAUSE_TALKING) && !(CommData.AlienTransitionDesc.AnimFlags & PAUSE_TALKING))
&& !summary)
{ {
BOOLEAN done = 0; BOOLEAN done = 0;
for (i = 0; i < CommData.NumAnimations; i++) for (i = 0; i < CommData.NumAnimations; i++)
@@ -1194,7 +1191,7 @@ int ambient_anim_task(void* data)
DrawAlienFrame (TalkFrame, &Sequencer[CommData.NumAnimations - 1]); DrawAlienFrame (TalkFrame, &Sequencer[CommData.NumAnimations - 1]);
CommData.AlienFrame = F; CommData.AlienFrame = F;
ColorChange = FALSE; ColorChange = FALSE;
ClearSub = FALSE; ClearSub = TRUE;
CheckSub = 1; CheckSub = 1;
} }
if (Change || ClearSub) if (Change || ClearSub)