From a0b5d580732b70518b130f20a886d355669f9239 Mon Sep 17 00:00:00 2001 From: gewlitys Date: Tue, 22 Apr 2003 22:59:06 +0000 Subject: [PATCH] Fix glitch conversation summary caused to animations (bug #320), from chmmravatar git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@925 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/comm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c index 8227605b9..7b8e22fd7 100644 --- a/sc2/src/sc2code/comm.c +++ b/sc2/src/sc2code/comm.c @@ -388,8 +388,6 @@ DrawAlienFrame (FRAME aframe, PSEQUENCE pSeq) COUNT i; STAMP s; ANIMATION_DESCPTR ADPtr; - if (summary) - return; s.origin.x = -SAFE_X; s.origin.y = 0; @@ -885,7 +883,7 @@ int ambient_anim_task(void* data) pSeq = &Sequencer[i]; ADPtr = &CommData.AlienAmbientArray[i]; - while (i-- && !Task_ReadState (task, TASK_EXIT) && !summary) + while (i-- && !Task_ReadState (task, TASK_EXIT)) { --ADPtr; --pSeq; @@ -1023,8 +1021,7 @@ int ambient_anim_task(void* data) if (CanTalk && ADPtr->NumFrames && (ADPtr->AnimFlags & WAIT_TALKING) - && !(CommData.AlienTransitionDesc.AnimFlags & PAUSE_TALKING) - && !summary) + && !(CommData.AlienTransitionDesc.AnimFlags & PAUSE_TALKING)) { BOOLEAN done = 0; for (i = 0; i < CommData.NumAnimations; i++) @@ -1194,7 +1191,7 @@ int ambient_anim_task(void* data) DrawAlienFrame (TalkFrame, &Sequencer[CommData.NumAnimations - 1]); CommData.AlienFrame = F; ColorChange = FALSE; - ClearSub = FALSE; + ClearSub = TRUE; CheckSub = 1; } if (Change || ClearSub)