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

Fixes 'left hand tapping' anim to be properly blocked by 'left wing rising' anim (bug #807); plus some comments

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2122 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-12-26 12:06:09 +00:00
parent 2c970ce937
commit 9ff8f65465
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/rebel/rebel.c
+9 -9
View File
@@ -39,24 +39,24 @@ static LOCDATA yehat_desc =
0, /* AlienSongFlags */ 0, /* AlienSongFlags */
REBEL_CONVERSATION_PHRASES, /* PlayerPhrases */ REBEL_CONVERSATION_PHRASES, /* PlayerPhrases */
15, /* NumAnimations */ 15, /* NumAnimations */
{ { /* AlienAmbientArray (ambient animations) */
{ { /* right hand-wing tapping keyboard; front guy */
4, /* StartIndex */ 4, /* StartIndex */
3, /* NumFrames */ 3, /* NumFrames */
YOYO_ANIM YOYO_ANIM
| WAIT_TALKING, /* AnimFlags */ | WAIT_TALKING, /* AnimFlags */
ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */ ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */
ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
(1 << 6), (1 << 6) | (1 << 7),
}, },
{ { /* left hand-wing tapping keyboard; front guy */
7, /* StartIndex */ 7, /* StartIndex */
3, /* NumFrames */ 3, /* NumFrames */
YOYO_ANIM YOYO_ANIM
| WAIT_TALKING, /* AnimFlags */ | WAIT_TALKING, /* AnimFlags */
ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */ ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */
ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
(1 << 6), (1 << 6) | (1 << 7),
}, },
{ {
10, /* StartIndex */ 10, /* StartIndex */
@@ -90,7 +90,7 @@ static LOCDATA yehat_desc =
ONE_SECOND * 10, ONE_SECOND * 3,/* RestartRate */ ONE_SECOND * 10, ONE_SECOND * 3,/* RestartRate */
(1 << 3), (1 << 3),
}, },
{ { /* right arm-wing rising; front guy */
26, /* StartIndex */ 26, /* StartIndex */
2, /* NumFrames */ 2, /* NumFrames */
YOYO_ANIM YOYO_ANIM
@@ -99,7 +99,7 @@ static LOCDATA yehat_desc =
ONE_SECOND * 10, ONE_SECOND * 3,/* RestartRate */ ONE_SECOND * 10, ONE_SECOND * 3,/* RestartRate */
(1 << 0) | (1 << 1), (1 << 0) | (1 << 1),
}, },
{ { /* left arm-wing rising; front guy */
28, /* StartIndex */ 28, /* StartIndex */
2, /* NumFrames */ 2, /* NumFrames */
YOYO_ANIM YOYO_ANIM
@@ -166,7 +166,7 @@ static LOCDATA yehat_desc =
(1 << 2) | (1 << 4), (1 << 2) | (1 << 4),
}, },
}, },
{ { /* AlienTransitionDesc - empty */
0, /* StartIndex */ 0, /* StartIndex */
0, /* NumFrames */ 0, /* NumFrames */
0, /* AnimFlags */ 0, /* AnimFlags */
@@ -174,7 +174,7 @@ static LOCDATA yehat_desc =
0, 0, /* RestartRate */ 0, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
{ { /* AlienTalkDesc */
1, /* StartIndex */ 1, /* StartIndex */
3, /* NumFrames */ 3, /* NumFrames */
0, /* AnimFlags */ 0, /* AnimFlags */