From fe137f036c9337774b9e004ba1781878308ba44f Mon Sep 17 00:00:00 2001 From: avolkov Date: Thu, 19 Nov 2009 13:49:36 +0000 Subject: [PATCH] Arilou animations fixes: set WAIT_TALKING flag for the correct anims; flag some mutually-exclusive anims; couple comments git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3328 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/uqm/comm/arilou/arilouc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sc2/src/uqm/comm/arilou/arilouc.c b/sc2/src/uqm/comm/arilou/arilouc.c index 00cdc287e..12e81a8b2 100644 --- a/sc2/src/uqm/comm/arilou/arilouc.c +++ b/sc2/src/uqm/comm/arilou/arilouc.c @@ -179,29 +179,29 @@ static LOCDATA arilou_desc = ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ (1 << 0) | (1 << 1) | (1 << 2) }, - { + { /* Hands moving (right up) */ 155, /* StartIndex */ 2, /* NumFrames */ - CIRCULAR_ANIM, /* AnimFlags */ + CIRCULAR_ANIM | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ - 0, /* BlockMask */ + (1 << 19), /* BlockMask */ }, - { + { /* Hands moving (left up) */ 157, /* StartIndex */ 2, /* NumFrames */ - CIRCULAR_ANIM, /* AnimFlags */ + CIRCULAR_ANIM | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ - 0, /* BlockMask */ + (1 << 19), /* BlockMask */ }, - { + { /* Stars flashing next to the head */ 159, /* StartIndex */ 4, /* NumFrames */ - CIRCULAR_ANIM | WAIT_TALKING,/* AnimFlags */ + CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 12, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ - 0, /* BlockMask */ + (1 << 17) | (1 << 18), /* BlockMask */ }, }, { /* AlienTransitionDesc */