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

A few comments, cleanups.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2861 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2007-11-24 22:22:33 +00:00
parent 78972b912e
commit 839ccbaf1f
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/commanim.c
+16 -5
View File
@@ -115,6 +115,8 @@ ambient_anim_task (void *data)
SEQUENCE *pSeq; SEQUENCE *pSeq;
ANIMATION_DESC *ADPtr; ANIMATION_DESC *ADPtr;
DWORD ActiveMask; DWORD ActiveMask;
// Bit mask of all animations that are currently active.
// Bit 'i' is set if the animation with index 'i' is active.
DWORD LastOscillTime; DWORD LastOscillTime;
Task task = (Task) data; Task task = (Task) data;
BOOLEAN TransitionDone = FALSE; BOOLEAN TransitionDone = FALSE;
@@ -139,13 +141,16 @@ ambient_anim_task (void *data)
memset (FrameChanged, 0, sizeof (FrameChanged)); memset (FrameChanged, 0, sizeof (FrameChanged));
memset (AnimFrame, 0, sizeof (AnimFrame)); memset (AnimFrame, 0, sizeof (AnimFrame));
for (i = 0; i < CommData.NumAnimations; i++) for (i = 0; i < CommData.NumAnimations; i++)
{
COUNT nextIndex;
if (CommData.AlienAmbientArray[i].AnimFlags & YOYO_ANIM) if (CommData.AlienAmbientArray[i].AnimFlags & YOYO_ANIM)
AnimFrame[i] = SetAbsFrameIndex (CommFrame, nextIndex = CommData.AlienAmbientArray[i].StartIndex;
CommData.AlienAmbientArray[i].StartIndex);
else else
AnimFrame[i] = SetAbsFrameIndex (CommFrame, nextIndex = (CommData.AlienAmbientArray[i].StartIndex
(COUNT)(CommData.AlienAmbientArray[i].StartIndex + CommData.AlienAmbientArray[i].NumFrames - 1);
+ CommData.AlienAmbientArray[i].NumFrames - 1)); AnimFrame[i] = SetAbsFrameIndex (CommFrame, nextIndex);
}
while (!Task_ReadState (task, TASK_EXIT)) while (!Task_ReadState (task, TASK_EXIT))
{ {
@@ -182,8 +187,12 @@ ambient_anim_task (void *data)
{ {
if (!(ADPtr->AnimFlags if (!(ADPtr->AnimFlags
& CommData.AlienTalkDesc.AnimFlags & WAIT_TALKING)) & CommData.AlienTalkDesc.AnimFlags & WAIT_TALKING))
{
// This animation does not conflict with the talking
// animation right now.
pSeq->Direction = UP_DIR; pSeq->Direction = UP_DIR;
} }
}
else if ((DWORD)pSeq->Alarm > ElapsedTicks) else if ((DWORD)pSeq->Alarm > ElapsedTicks)
pSeq->Alarm -= (COUNT)ElapsedTicks; pSeq->Alarm -= (COUNT)ElapsedTicks;
else else
@@ -281,6 +290,8 @@ ambient_anim_task (void *data)
& CommData.AlienTalkDesc.AnimFlags & WAIT_TALKING) & CommData.AlienTalkDesc.AnimFlags & WAIT_TALKING)
&& pSeq->Direction != NO_DIR) && pSeq->Direction != NO_DIR)
{ {
// This is a picture animation which would conflict with
// the talking animation, and it is not stopped yet.
COUNT index; COUNT index;
CanTalk = FALSE; CanTalk = FALSE;