[patch] fix for the brace warnings
mike at vinge.mine.nu
mike at vinge.mine.nu
Tue Feb 19 16:20:16 EST 2002
here's a fix for the brace warnings- it's a bit big, but that's all it
does. i didn't actually make the fix, i just did the diff :) (Lloyd
Williams did them)
--
To smash a single atom, all mankind was intent.
Now any day the atom may return the compliment.
-------------- next part --------------
Index: src/game/m_actor.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_actor.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_actor.c
--- src/game/m_actor.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_actor.c 2002/02/19 21:12:34
@@ -38,49 +38,49 @@
mframe_t actor_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t actor_move_stand = {FRAME_stand101, FRAME_stand140, actor_frames_stand, NULL};
@@ -96,17 +96,17 @@
mframe_t actor_frames_walk [] =
{
- ai_walk, 0, NULL,
- ai_walk, 6, NULL,
- ai_walk, 10, NULL,
- ai_walk, 3, NULL,
- ai_walk, 2, NULL,
- ai_walk, 7, NULL,
- ai_walk, 10, NULL,
- ai_walk, 1, NULL,
- ai_walk, 4, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL
+ {ai_walk, 0, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 10, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 10, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL}
};
mmove_t actor_move_walk = {FRAME_walk01, FRAME_walk08, actor_frames_walk, NULL};
@@ -118,18 +118,18 @@
mframe_t actor_frames_run [] =
{
- ai_run, 4, NULL,
- ai_run, 15, NULL,
- ai_run, 15, NULL,
- ai_run, 8, NULL,
- ai_run, 20, NULL,
- ai_run, 15, NULL,
- ai_run, 8, NULL,
- ai_run, 17, NULL,
- ai_run, 12, NULL,
- ai_run, -2, NULL,
- ai_run, -2, NULL,
- ai_run, -1, NULL
+ {ai_run, 4, NULL},
+ {ai_run, 15, NULL},
+ {ai_run, 15, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 20, NULL},
+ {ai_run, 15, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 17, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, -2, NULL},
+ {ai_run, -2, NULL},
+ {ai_run, -1, NULL}
};
mmove_t actor_move_run = {FRAME_run02, FRAME_run07, actor_frames_run, NULL};
@@ -156,66 +156,66 @@
mframe_t actor_frames_pain1 [] =
{
- ai_move, -5, NULL,
- ai_move, 4, NULL,
- ai_move, 1, NULL
+ {ai_move, -5, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 1, NULL}
};
mmove_t actor_move_pain1 = {FRAME_pain101, FRAME_pain103, actor_frames_pain1, actor_run};
mframe_t actor_frames_pain2 [] =
{
- ai_move, -4, NULL,
- ai_move, 4, NULL,
- ai_move, 0, NULL
+ {ai_move, -4, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 0, NULL}
};
mmove_t actor_move_pain2 = {FRAME_pain201, FRAME_pain203, actor_frames_pain2, actor_run};
mframe_t actor_frames_pain3 [] =
{
- ai_move, -1, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL
+ {ai_move, -1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL}
};
mmove_t actor_move_pain3 = {FRAME_pain301, FRAME_pain303, actor_frames_pain3, actor_run};
mframe_t actor_frames_flipoff [] =
{
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL}
};
mmove_t actor_move_flipoff = {FRAME_flip01, FRAME_flip14, actor_frames_flipoff, actor_run};
mframe_t actor_frames_taunt [] =
{
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL,
- ai_turn, 0, NULL
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL},
+ {ai_turn, 0, NULL}
};
mmove_t actor_move_taunt = {FRAME_taunt01, FRAME_taunt17, actor_frames_taunt, actor_run};
@@ -308,31 +308,31 @@
mframe_t actor_frames_death1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -13, NULL,
- ai_move, 14, NULL,
- ai_move, 3, NULL,
- ai_move, -2, NULL,
- ai_move, 1, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -13, NULL},
+ {ai_move, 14, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 1, NULL}
};
mmove_t actor_move_death1 = {FRAME_death101, FRAME_death107, actor_frames_death1, actor_dead};
mframe_t actor_frames_death2 [] =
{
- ai_move, 0, NULL,
- ai_move, 7, NULL,
- ai_move, -6, NULL,
- ai_move, -5, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, -2, NULL,
- ai_move, -1, NULL,
- ai_move, -9, NULL,
- ai_move, -13, NULL,
- ai_move, -13, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 7, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -9, NULL},
+ {ai_move, -13, NULL},
+ {ai_move, -13, NULL},
+ {ai_move, 0, NULL}
};
mmove_t actor_move_death2 = {FRAME_death201, FRAME_death213, actor_frames_death2, actor_dead};
@@ -381,10 +381,10 @@
mframe_t actor_frames_attack [] =
{
- ai_charge, -2, actor_fire,
- ai_charge, -2, NULL,
- ai_charge, 3, NULL,
- ai_charge, 2, NULL
+ {ai_charge, -2, actor_fire},
+ {ai_charge, -2, NULL},
+ {ai_charge, 3, NULL},
+ {ai_charge, 2, NULL}
};
mmove_t actor_move_attack = {FRAME_attak01, FRAME_attak04, actor_frames_attack, actor_run};
Index: src/game/m_berserk.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_berserk.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_berserk.c
--- src/game/m_berserk.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_berserk.c 2002/02/19 21:12:34
@@ -50,11 +50,11 @@
void berserk_fidget (edict_t *self);
mframe_t berserk_frames_stand [] =
{
- ai_stand, 0, berserk_fidget,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, berserk_fidget},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t berserk_move_stand = {FRAME_stand1, FRAME_stand5, berserk_frames_stand, NULL};
@@ -65,26 +65,26 @@
mframe_t berserk_frames_stand_fidget [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t berserk_move_stand_fidget = {FRAME_standb1, FRAME_standb20, berserk_frames_stand_fidget, berserk_stand};
@@ -102,18 +102,18 @@
mframe_t berserk_frames_walk [] =
{
- ai_walk, 9.1, NULL,
- ai_walk, 6.3, NULL,
- ai_walk, 4.9, NULL,
- ai_walk, 6.7, NULL,
- ai_walk, 6.0, NULL,
- ai_walk, 8.2, NULL,
- ai_walk, 7.2, NULL,
- ai_walk, 6.1, NULL,
- ai_walk, 4.9, NULL,
- ai_walk, 4.7, NULL,
- ai_walk, 4.7, NULL,
- ai_walk, 4.8, NULL
+ {ai_walk, 9.1, NULL},
+ {ai_walk, 6.3, NULL},
+ {ai_walk, 4.9, NULL},
+ {ai_walk, 6.7, NULL},
+ {ai_walk, 6.0, NULL},
+ {ai_walk, 8.2, NULL},
+ {ai_walk, 7.2, NULL},
+ {ai_walk, 6.1, NULL},
+ {ai_walk, 4.9, NULL},
+ {ai_walk, 4.7, NULL},
+ {ai_walk, 4.7, NULL},
+ {ai_walk, 4.8, NULL}
};
mmove_t berserk_move_walk = {FRAME_walkc1, FRAME_walkc11, berserk_frames_walk, NULL};
@@ -149,12 +149,12 @@
mframe_t berserk_frames_run1 [] =
{
- ai_run, 21, NULL,
- ai_run, 11, NULL,
- ai_run, 21, NULL,
- ai_run, 25, NULL,
- ai_run, 18, NULL,
- ai_run, 19, NULL
+ {ai_run, 21, NULL},
+ {ai_run, 11, NULL},
+ {ai_run, 21, NULL},
+ {ai_run, 25, NULL},
+ {ai_run, 18, NULL},
+ {ai_run, 19, NULL}
};
mmove_t berserk_move_run1 = {FRAME_run1, FRAME_run6, berserk_frames_run1, NULL};
@@ -181,14 +181,14 @@
mframe_t berserk_frames_attack_spike [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, berserk_swing,
- ai_charge, 0, berserk_attack_spike,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, berserk_swing},
+ {ai_charge, 0, berserk_attack_spike},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t berserk_move_attack_spike = {FRAME_att_c1, FRAME_att_c8, berserk_frames_attack_spike, berserk_run};
@@ -203,18 +203,18 @@
mframe_t berserk_frames_attack_club [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, berserk_swing,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, berserk_attack_club,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, berserk_swing},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, berserk_attack_club},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t berserk_move_attack_club = {FRAME_att_c9, FRAME_att_c20, berserk_frames_attack_club, berserk_run};
@@ -227,20 +227,20 @@
mframe_t berserk_frames_attack_strike [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, berserk_swing,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, berserk_strike,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 9.7, NULL,
- ai_move, 13.6, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, berserk_swing},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, berserk_strike},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 9.7, NULL},
+ {ai_move, 13.6, NULL}
};
mmove_t berserk_move_attack_strike = {FRAME_att_c21, FRAME_att_c34, berserk_frames_attack_strike, berserk_run};
@@ -279,36 +279,36 @@
mframe_t berserk_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t berserk_move_pain1 = {FRAME_painc1, FRAME_painc4, berserk_frames_pain1, berserk_run};
mframe_t berserk_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t berserk_move_pain2 = {FRAME_painb1, FRAME_painb20, berserk_frames_pain2, berserk_run};
@@ -346,19 +346,19 @@
mframe_t berserk_frames_death1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t berserk_move_death1 = {FRAME_death1, FRAME_death13, berserk_frames_death1, berserk_dead};
@@ -366,14 +366,14 @@
mframe_t berserk_frames_death2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t berserk_move_death2 = {FRAME_deathc1, FRAME_deathc8, berserk_frames_death2, berserk_dead};
Index: src/game/m_boss2.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_boss2.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_boss2.c
--- src/game/m_boss2.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_boss2.c 2002/02/19 21:12:34
@@ -153,127 +153,127 @@
mframe_t boss2_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t boss2_move_stand = {FRAME_stand30, FRAME_stand50, boss2_frames_stand, NULL};
mframe_t boss2_frames_fidget [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t boss2_move_fidget = {FRAME_stand1, FRAME_stand30, boss2_frames_fidget, NULL};
mframe_t boss2_frames_walk [] =
{
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL}
};
mmove_t boss2_move_walk = {FRAME_walk1, FRAME_walk20, boss2_frames_walk, NULL};
mframe_t boss2_frames_run [] =
{
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL}
};
mmove_t boss2_move_run = {FRAME_walk1, FRAME_walk20, boss2_frames_run, NULL};
mframe_t boss2_frames_attack_pre_mg [] =
{
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, boss2_attack_mg
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, boss2_attack_mg}
};
mmove_t boss2_move_attack_pre_mg = {FRAME_attack1, FRAME_attack9, boss2_frames_attack_pre_mg, NULL};
@@ -281,133 +281,133 @@
// Loop this
mframe_t boss2_frames_attack_mg [] =
{
- ai_charge, 1, Boss2MachineGun,
- ai_charge, 1, Boss2MachineGun,
- ai_charge, 1, Boss2MachineGun,
- ai_charge, 1, Boss2MachineGun,
- ai_charge, 1, Boss2MachineGun,
- ai_charge, 1, boss2_reattack_mg
+ {ai_charge, 1, Boss2MachineGun},
+ {ai_charge, 1, Boss2MachineGun},
+ {ai_charge, 1, Boss2MachineGun},
+ {ai_charge, 1, Boss2MachineGun},
+ {ai_charge, 1, Boss2MachineGun},
+ {ai_charge, 1, boss2_reattack_mg}
};
mmove_t boss2_move_attack_mg = {FRAME_attack10, FRAME_attack15, boss2_frames_attack_mg, NULL};
mframe_t boss2_frames_attack_post_mg [] =
{
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL}
};
mmove_t boss2_move_attack_post_mg = {FRAME_attack16, FRAME_attack19, boss2_frames_attack_post_mg, boss2_run};
mframe_t boss2_frames_attack_rocket [] =
{
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_move, -20, Boss2Rocket,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_move, -20, Boss2Rocket},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL}
};
mmove_t boss2_move_attack_rocket = {FRAME_attack20, FRAME_attack40, boss2_frames_attack_rocket, boss2_run};
mframe_t boss2_frames_pain_heavy [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t boss2_move_pain_heavy = {FRAME_pain2, FRAME_pain19, boss2_frames_pain_heavy, boss2_run};
mframe_t boss2_frames_pain_light [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t boss2_move_pain_light = {FRAME_pain20, FRAME_pain23, boss2_frames_pain_light, boss2_run};
mframe_t boss2_frames_death [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, BossExplode
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, BossExplode}
};
mmove_t boss2_move_death = {FRAME_death2, FRAME_death50, boss2_frames_death, boss2_dead};
Index: src/game/m_boss31.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_boss31.c,v
retrieving revision 1.2
diff -u -r1.2 m_boss31.c
--- src/game/m_boss31.c 2002/01/03 05:10:14 1.2
+++ src/game/m_boss31.c 2002/02/19 21:12:34
@@ -82,57 +82,57 @@
mframe_t jorg_frames_stand []=
{
- ai_stand, 0, jorg_idle,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 10
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 20
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 30
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 19, NULL,
- ai_stand, 11, jorg_step_left,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 6, NULL,
- ai_stand, 9, jorg_step_right,
- ai_stand, 0, NULL, // 40
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, -2, NULL,
- ai_stand, -17, jorg_step_left,
- ai_stand, 0, NULL,
- ai_stand, -12, NULL, // 50
- ai_stand, -14, jorg_step_right // 51
+ {ai_stand, 0, jorg_idle},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 10
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 20
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 30
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 19, NULL},
+ {ai_stand, 11, jorg_step_left},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 6, NULL},
+ {ai_stand, 9, jorg_step_right},
+ {ai_stand, 0, NULL}, // 40
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, -2, NULL},
+ {ai_stand, -17, jorg_step_left},
+ {ai_stand, 0, NULL},
+ {ai_stand, -12, NULL}, // 50
+ {ai_stand, -14, jorg_step_right} // 51
};
mmove_t jorg_move_stand = {FRAME_stand01, FRAME_stand51, jorg_frames_stand, NULL};
@@ -165,20 +165,20 @@
mframe_t jorg_frames_run [] =
{
- ai_run, 17, jorg_step_left,
- ai_run, 0, NULL,
- ai_run, 0, NULL,
- ai_run, 0, NULL,
- ai_run, 12, NULL,
- ai_run, 8, NULL,
- ai_run, 10, NULL,
- ai_run, 33, jorg_step_right,
- ai_run, 0, NULL,
- ai_run, 0, NULL,
- ai_run, 0, NULL,
- ai_run, 9, NULL,
- ai_run, 9, NULL,
- ai_run, 9, NULL
+ {ai_run, 17, jorg_step_left},
+ {ai_run, 0, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 33, jorg_step_right},
+ {ai_run, 0, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, 9, NULL},
+ {ai_run, 9, NULL},
+ {ai_run, 9, NULL}
};
mmove_t jorg_move_run = {FRAME_walk06, FRAME_walk19, jorg_frames_run, NULL};
@@ -188,41 +188,41 @@
mframe_t jorg_frames_start_walk [] =
{
- ai_walk, 5, NULL,
- ai_walk, 6, NULL,
- ai_walk, 7, NULL,
- ai_walk, 9, NULL,
- ai_walk, 15, NULL
+ {ai_walk, 5, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 9, NULL},
+ {ai_walk, 15, NULL}
};
mmove_t jorg_move_start_walk = {FRAME_walk01, FRAME_walk05, jorg_frames_start_walk, NULL};
mframe_t jorg_frames_walk [] =
{
- ai_walk, 17, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 12, NULL,
- ai_walk, 8, NULL,
- ai_walk, 10, NULL,
- ai_walk, 33, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 9, NULL,
- ai_walk, 9, NULL,
- ai_walk, 9, NULL
+ {ai_walk, 17, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 12, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 10, NULL},
+ {ai_walk, 33, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 9, NULL},
+ {ai_walk, 9, NULL},
+ {ai_walk, 9, NULL}
};
mmove_t jorg_move_walk = {FRAME_walk06, FRAME_walk19, jorg_frames_walk, NULL};
mframe_t jorg_frames_end_walk [] =
{
- ai_walk, 11, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 8, NULL,
- ai_walk, -8, NULL
+ {ai_walk, 11, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, -8, NULL}
};
mmove_t jorg_move_end_walk = {FRAME_walk20, FRAME_walk25, jorg_frames_end_walk, NULL};
@@ -241,153 +241,153 @@
mframe_t jorg_frames_pain3 [] =
{
- ai_move, -28, NULL,
- ai_move, -6, NULL,
- ai_move, -3, jorg_step_left,
- ai_move, -9, NULL,
- ai_move, 0, jorg_step_right,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -7, NULL,
- ai_move, 1, NULL,
- ai_move, -11, NULL,
- ai_move, -4, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 10, NULL,
- ai_move, 11, NULL,
- ai_move, 0, NULL,
- ai_move, 10, NULL,
- ai_move, 3, NULL,
- ai_move, 10, NULL,
- ai_move, 7, jorg_step_left,
- ai_move, 17, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, jorg_step_right
+ {ai_move, -28, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, -3, jorg_step_left},
+ {ai_move, -9, NULL},
+ {ai_move, 0, jorg_step_right},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -7, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, -11, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 10, NULL},
+ {ai_move, 11, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 10, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 10, NULL},
+ {ai_move, 7, jorg_step_left},
+ {ai_move, 17, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, jorg_step_right}
};
mmove_t jorg_move_pain3 = {FRAME_pain301, FRAME_pain325, jorg_frames_pain3, jorg_run};
mframe_t jorg_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t jorg_move_pain2 = {FRAME_pain201, FRAME_pain203, jorg_frames_pain2, jorg_run};
mframe_t jorg_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t jorg_move_pain1 = {FRAME_pain101, FRAME_pain103, jorg_frames_pain1, jorg_run};
mframe_t jorg_frames_death1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 10
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 20
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 30
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 40
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, MakronToss,
- ai_move, 0, BossExplode // 50
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 10
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 20
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 30
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 40
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, MakronToss},
+ {ai_move, 0, BossExplode} // 50
};
mmove_t jorg_move_death = {FRAME_death01, FRAME_death50, jorg_frames_death1, jorg_dead};
mframe_t jorg_frames_attack2 []=
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, jorgBFG,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, jorgBFG},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t jorg_move_attack2 = {FRAME_attak201, FRAME_attak213, jorg_frames_attack2, jorg_run};
mframe_t jorg_frames_start_attack1 [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t jorg_move_start_attack1 = {FRAME_attak101, FRAME_attak108, jorg_frames_start_attack1, jorg_attack1};
mframe_t jorg_frames_attack1[]=
{
- ai_charge, 0, jorg_firebullet,
- ai_charge, 0, jorg_firebullet,
- ai_charge, 0, jorg_firebullet,
- ai_charge, 0, jorg_firebullet,
- ai_charge, 0, jorg_firebullet,
- ai_charge, 0, jorg_firebullet
+ {ai_charge, 0, jorg_firebullet},
+ {ai_charge, 0, jorg_firebullet},
+ {ai_charge, 0, jorg_firebullet},
+ {ai_charge, 0, jorg_firebullet},
+ {ai_charge, 0, jorg_firebullet},
+ {ai_charge, 0, jorg_firebullet}
};
mmove_t jorg_move_attack1 = {FRAME_attak109, FRAME_attak114, jorg_frames_attack1, jorg_reattack1};
mframe_t jorg_frames_end_attack1[]=
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t jorg_move_end_attack1 = {FRAME_attak115, FRAME_attak118, jorg_frames_end_attack1, jorg_run};
Index: src/game/m_boss32.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_boss32.c,v
retrieving revision 1.2
diff -u -r1.2 m_boss32.c
--- src/game/m_boss32.c 2002/01/03 05:10:14 1.2
+++ src/game/m_boss32.c 2002/02/19 21:12:35
@@ -72,66 +72,66 @@
mframe_t makron_frames_stand []=
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 10
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 20
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 30
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 40
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 50
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL // 60
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 10
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 20
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 30
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 40
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 50
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL} // 60
};
mmove_t makron_move_stand = {FRAME_stand201, FRAME_stand260, makron_frames_stand, NULL};
@@ -142,16 +142,16 @@
mframe_t makron_frames_run [] =
{
- ai_run, 3, makron_step_left,
- ai_run, 12, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, makron_step_right,
- ai_run, 6, NULL,
- ai_run, 12, NULL,
- ai_run, 9, NULL,
- ai_run, 6, NULL,
- ai_run, 12, NULL
+ {ai_run, 3, makron_step_left},
+ {ai_run, 12, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, makron_step_right},
+ {ai_run, 6, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 9, NULL},
+ {ai_run, 6, NULL},
+ {ai_run, 12, NULL}
};
mmove_t makron_move_run = {FRAME_walk204, FRAME_walk213, makron_frames_run, NULL};
@@ -188,16 +188,16 @@
mframe_t makron_frames_walk [] =
{
- ai_walk, 3, makron_step_left,
- ai_walk, 12, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, NULL,
- ai_walk, 8, makron_step_right,
- ai_walk, 6, NULL,
- ai_walk, 12, NULL,
- ai_walk, 9, NULL,
- ai_walk, 6, NULL,
- ai_walk, 12, NULL
+ {ai_walk, 3, makron_step_left},
+ {ai_walk, 12, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 8, makron_step_right},
+ {ai_walk, 6, NULL},
+ {ai_walk, 12, NULL},
+ {ai_walk, 9, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 12, NULL}
};
mmove_t makron_move_walk = {FRAME_walk204, FRAME_walk213, makron_frames_run, NULL};
@@ -216,194 +216,194 @@
mframe_t makron_frames_pain6 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 10
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, makron_popup,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 20
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, makron_taunt,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 10
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, makron_popup},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 20
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, makron_taunt},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t makron_move_pain6 = {FRAME_pain601, FRAME_pain627, makron_frames_pain6, makron_run};
mframe_t makron_frames_pain5 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t makron_move_pain5 = {FRAME_pain501, FRAME_pain504, makron_frames_pain5, makron_run};
mframe_t makron_frames_pain4 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t makron_move_pain4 = {FRAME_pain401, FRAME_pain404, makron_frames_pain4, makron_run};
mframe_t makron_frames_death2 [] =
{
- ai_move, -15, NULL,
- ai_move, 3, NULL,
- ai_move, -12, NULL,
- ai_move, 0, makron_step_left,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 10
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 11, NULL,
- ai_move, 12, NULL,
- ai_move, 11, makron_step_right,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 20
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 30
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 5, NULL,
- ai_move, 7, NULL,
- ai_move, 6, makron_step_left,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, 2, NULL, // 40
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 50
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -6, NULL,
- ai_move, -4, NULL,
- ai_move, -6, makron_step_right,
- ai_move, -4, NULL,
- ai_move, -4, makron_step_left,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 60
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -2, NULL,
- ai_move, -5, NULL,
- ai_move, -3, makron_step_right,
- ai_move, -8, NULL,
- ai_move, -3, makron_step_left,
- ai_move, -7, NULL,
- ai_move, -4, NULL,
- ai_move, -4, makron_step_right, // 70
- ai_move, -6, NULL,
- ai_move, -7, NULL,
- ai_move, 0, makron_step_left,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 80
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL, // 90
- ai_move, 27, makron_hit,
- ai_move, 26, NULL,
- ai_move, 0, makron_brainsplorch,
- ai_move, 0, NULL,
- ai_move, 0, NULL // 95
+ {ai_move, -15, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, -12, NULL},
+ {ai_move, 0, makron_step_left},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 10
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 11, NULL},
+ {ai_move, 12, NULL},
+ {ai_move, 11, makron_step_right},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 20
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 30
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, 7, NULL},
+ {ai_move, 6, makron_step_left},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 2, NULL}, // 40
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 50
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, -6, makron_step_right},
+ {ai_move, -4, NULL},
+ {ai_move, -4, makron_step_left},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 60
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, -3, makron_step_right},
+ {ai_move, -8, NULL},
+ {ai_move, -3, makron_step_left},
+ {ai_move, -7, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, -4, makron_step_right}, // 70
+ {ai_move, -6, NULL},
+ {ai_move, -7, NULL},
+ {ai_move, 0, makron_step_left},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 80
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL}, // 90
+ {ai_move, 27, makron_hit},
+ {ai_move, 26, NULL},
+ {ai_move, 0, makron_brainsplorch},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL} // 95
};
mmove_t makron_move_death2 = {FRAME_death201, FRAME_death295, makron_frames_death2, makron_dead};
mframe_t makron_frames_death3 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t makron_move_death3 = {FRAME_death301, FRAME_death320, makron_frames_death3, NULL};
mframe_t makron_frames_sight [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t makron_move_sight= {FRAME_active01, FRAME_active13, makron_frames_sight, makron_run};
@@ -428,66 +428,66 @@
mframe_t makron_frames_attack3 []=
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, makronBFG, // FIXME: BFG Attack here
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, makronBFG}, // FIXME: BFG Attack here
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t makron_move_attack3 = {FRAME_attak301, FRAME_attak308, makron_frames_attack3, makron_run};
mframe_t makron_frames_attack4[]=
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, MakronHyperblaster, // fire
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, MakronHyperblaster}, // fire
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t makron_move_attack4 = {FRAME_attak401, FRAME_attak426, makron_frames_attack4, makron_run};
mframe_t makron_frames_attack5[]=
{
- ai_charge, 0, makron_prerailgun,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, MakronSaveloc,
- ai_move, 0, MakronRailgun, // Fire railgun
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_charge, 0, makron_prerailgun},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, MakronSaveloc},
+ {ai_move, 0, MakronRailgun}, // Fire railgun
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t makron_move_attack5 = {FRAME_attak501, FRAME_attak516, makron_frames_attack5, makron_run};
Index: src/game/m_brain.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_brain.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_brain.c
--- src/game/m_brain.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_brain.c 2002/02/19 21:12:35
@@ -66,38 +66,38 @@
mframe_t brain_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t brain_move_stand = {FRAME_stand01, FRAME_stand30, brain_frames_stand, NULL};
@@ -113,38 +113,38 @@
mframe_t brain_frames_idle [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t brain_move_idle = {FRAME_stand31, FRAME_stand60, brain_frames_idle, brain_stand};
@@ -160,17 +160,17 @@
//
mframe_t brain_frames_walk1 [] =
{
- ai_walk, 7, NULL,
- ai_walk, 2, NULL,
- ai_walk, 3, NULL,
- ai_walk, 3, NULL,
- ai_walk, 1, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 9, NULL,
- ai_walk, -4, NULL,
- ai_walk, -1, NULL,
- ai_walk, 2, NULL
+ {ai_walk, 7, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 9, NULL},
+ {ai_walk, -4, NULL},
+ {ai_walk, -1, NULL},
+ {ai_walk, 2, NULL}
};
mmove_t brain_move_walk1 = {FRAME_walk101, FRAME_walk111, brain_frames_walk1, NULL};
@@ -184,49 +184,49 @@
mframe_t brain_frames_walk2 [] =
{
- ai_walk, 3, NULL,
- ai_walk, -2, NULL,
- ai_walk, -4, NULL,
- ai_walk, -3, NULL,
- ai_walk, 0, NULL,
- ai_walk, 1, NULL,
- ai_walk, 12, NULL,
- ai_walk, 0, NULL,
- ai_walk, -3, NULL,
- ai_walk, 0, NULL,
-
- ai_walk, -2, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 1, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 10, NULL, // Cycle Start
-
- ai_walk, -1, NULL,
- ai_walk, 7, NULL,
- ai_walk, 0, NULL,
- ai_walk, 3, NULL,
- ai_walk, -3, NULL,
- ai_walk, 2, NULL,
- ai_walk, 4, NULL,
- ai_walk, -3, NULL,
- ai_walk, 2, NULL,
- ai_walk, 0, NULL,
-
- ai_walk, 4, brain_walk2_cycle,
- ai_walk, -1, NULL,
- ai_walk, -1, NULL,
- ai_walk, -8, NULL,
- ai_walk, 0, NULL,
- ai_walk, 1, NULL,
- ai_walk, 5, NULL,
- ai_walk, 2, NULL,
- ai_walk, -1, NULL,
- ai_walk, -5, NULL
+ {ai_walk, 3, NULL},
+ {ai_walk, -2, NULL},
+ {ai_walk, -4, NULL},
+ {ai_walk, -3, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 12, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, -3, NULL},
+ {ai_walk, 0, NULL},
+
+ {ai_walk, -2, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 10, NULL}, // Cycle Start
+
+ {ai_walk, -1, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, -3, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, -3, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 0, NULL},
+
+ {ai_walk, 4, brain_walk2_cycle},
+ {ai_walk, -1, NULL},
+ {ai_walk, -1, NULL},
+ {ai_walk, -8, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, -1, NULL},
+ {ai_walk, -5, NULL}
};
mmove_t brain_move_walk2 = {FRAME_walk201, FRAME_walk240, brain_frames_walk2, NULL};
#endif
@@ -243,65 +243,65 @@
mframe_t brain_frames_defense [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t brain_move_defense = {FRAME_defens01, FRAME_defens08, brain_frames_defense, NULL};
mframe_t brain_frames_pain3 [] =
{
- ai_move, -2, NULL,
- ai_move, 2, NULL,
- ai_move, 1, NULL,
- ai_move, 3, NULL,
- ai_move, 0, NULL,
- ai_move, -4, NULL
+ {ai_move, -2, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -4, NULL}
};
mmove_t brain_move_pain3 = {FRAME_pain301, FRAME_pain306, brain_frames_pain3, brain_run};
mframe_t brain_frames_pain2 [] =
{
- ai_move, -2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 3, NULL,
- ai_move, 1, NULL,
- ai_move, -2, NULL
+ {ai_move, -2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, -2, NULL}
};
mmove_t brain_move_pain2 = {FRAME_pain201, FRAME_pain208, brain_frames_pain2, brain_run};
mframe_t brain_frames_pain1 [] =
{
- ai_move, -6, NULL,
- ai_move, -2, NULL,
- ai_move, -6, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 1, NULL,
- ai_move, 7, NULL,
- ai_move, 0, NULL,
- ai_move, 3, NULL,
- ai_move, -1, NULL
+ {ai_move, -6, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 7, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, -1, NULL}
};
mmove_t brain_move_pain1 = {FRAME_pain101, FRAME_pain121, brain_frames_pain1, brain_run};
@@ -338,14 +338,14 @@
mframe_t brain_frames_duck [] =
{
- ai_move, 0, NULL,
- ai_move, -2, brain_duck_down,
- ai_move, 17, brain_duck_hold,
- ai_move, -3, NULL,
- ai_move, -1, brain_duck_up,
- ai_move, -5, NULL,
- ai_move, -6, NULL,
- ai_move, -6, NULL
+ {ai_move, 0, NULL},
+ {ai_move, -2, brain_duck_down},
+ {ai_move, 17, brain_duck_hold},
+ {ai_move, -3, NULL},
+ {ai_move, -1, brain_duck_up},
+ {ai_move, -5, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, -6, NULL}
};
mmove_t brain_move_duck = {FRAME_duck01, FRAME_duck08, brain_frames_duck, brain_run};
@@ -364,34 +364,34 @@
mframe_t brain_frames_death2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 9, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 9, NULL},
+ {ai_move, 0, NULL}
};
mmove_t brain_move_death2 = {FRAME_death201, FRAME_death205, brain_frames_death2, brain_dead};
mframe_t brain_frames_death1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -2, NULL,
- ai_move, 9, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 9, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t brain_move_death1 = {FRAME_death101, FRAME_death118, brain_frames_death1, brain_dead};
@@ -430,24 +430,24 @@
mframe_t brain_frames_attack1 [] =
{
- ai_charge, 8, NULL,
- ai_charge, 3, NULL,
- ai_charge, 5, NULL,
- ai_charge, 0, NULL,
- ai_charge, -3, brain_swing_right,
- ai_charge, 0, NULL,
- ai_charge, -5, NULL,
- ai_charge, -7, brain_hit_right,
- ai_charge, 0, NULL,
- ai_charge, 6, brain_swing_left,
- ai_charge, 1, NULL,
- ai_charge, 2, brain_hit_left,
- ai_charge, -3, NULL,
- ai_charge, 6, NULL,
- ai_charge, -1, NULL,
- ai_charge, -3, NULL,
- ai_charge, 2, NULL,
- ai_charge, -11,NULL
+ {ai_charge, 8, NULL},
+ {ai_charge, 3, NULL},
+ {ai_charge, 5, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -3, brain_swing_right},
+ {ai_charge, 0, NULL},
+ {ai_charge, -5, NULL},
+ {ai_charge, -7, brain_hit_right},
+ {ai_charge, 0, NULL},
+ {ai_charge, 6, brain_swing_left},
+ {ai_charge, 1, NULL},
+ {ai_charge, 2, brain_hit_left},
+ {ai_charge, -3, NULL},
+ {ai_charge, 6, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, -3, NULL},
+ {ai_charge, 2, NULL},
+ {ai_charge, -11,NULL}
};
mmove_t brain_move_attack1 = {FRAME_attak101, FRAME_attak118, brain_frames_attack1, brain_run};
@@ -480,23 +480,23 @@
mframe_t brain_frames_attack2 [] =
{
- ai_charge, 5, NULL,
- ai_charge, -4, NULL,
- ai_charge, -4, NULL,
- ai_charge, -3, NULL,
- ai_charge, 0, brain_chest_open,
- ai_charge, 0, NULL,
- ai_charge, 13, brain_tentacle_attack,
- ai_charge, 0, NULL,
- ai_charge, 2, NULL,
- ai_charge, 0, NULL,
- ai_charge, -9, brain_chest_closed,
- ai_charge, 0, NULL,
- ai_charge, 4, NULL,
- ai_charge, 3, NULL,
- ai_charge, 2, NULL,
- ai_charge, -3, NULL,
- ai_charge, -6, NULL
+ {ai_charge, 5, NULL},
+ {ai_charge, -4, NULL},
+ {ai_charge, -4, NULL},
+ {ai_charge, -3, NULL},
+ {ai_charge, 0, brain_chest_open},
+ {ai_charge, 0, NULL},
+ {ai_charge, 13, brain_tentacle_attack},
+ {ai_charge, 0, NULL},
+ {ai_charge, 2, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -9, brain_chest_closed},
+ {ai_charge, 0, NULL},
+ {ai_charge, 4, NULL},
+ {ai_charge, 3, NULL},
+ {ai_charge, 2, NULL},
+ {ai_charge, -3, NULL},
+ {ai_charge, -6, NULL}
};
mmove_t brain_move_attack2 = {FRAME_attak201, FRAME_attak217, brain_frames_attack2, brain_run};
@@ -515,17 +515,17 @@
mframe_t brain_frames_run [] =
{
- ai_run, 9, NULL,
- ai_run, 2, NULL,
- ai_run, 3, NULL,
- ai_run, 3, NULL,
- ai_run, 1, NULL,
- ai_run, 0, NULL,
- ai_run, 0, NULL,
- ai_run, 10, NULL,
- ai_run, -4, NULL,
- ai_run, -1, NULL,
- ai_run, 2, NULL
+ {ai_run, 9, NULL},
+ {ai_run, 2, NULL},
+ {ai_run, 3, NULL},
+ {ai_run, 3, NULL},
+ {ai_run, 1, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, -4, NULL},
+ {ai_run, -1, NULL},
+ {ai_run, 2, NULL}
};
mmove_t brain_move_run = {FRAME_walk101, FRAME_walk111, brain_frames_run, NULL};
Index: src/game/m_chick.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_chick.c,v
retrieving revision 1.2
diff -u -r1.2 m_chick.c
--- src/game/m_chick.c 2002/01/03 05:10:14 1.2
+++ src/game/m_chick.c 2002/02/19 21:12:35
@@ -63,36 +63,36 @@
mframe_t chick_frames_fidget [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, ChickMoan,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, ChickMoan},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t chick_move_fidget = {FRAME_stand201, FRAME_stand230, chick_frames_fidget, chick_stand};
@@ -106,36 +106,36 @@
mframe_t chick_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, chick_fidget,
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, chick_fidget},
};
mmove_t chick_move_stand = {FRAME_stand101, FRAME_stand130, chick_frames_stand, NULL};
@@ -147,31 +147,31 @@
mframe_t chick_frames_start_run [] =
{
- ai_run, 1, NULL,
- ai_run, 0, NULL,
- ai_run, 0, NULL,
- ai_run, -1, NULL,
- ai_run, -1, NULL,
- ai_run, 0, NULL,
- ai_run, 1, NULL,
- ai_run, 3, NULL,
- ai_run, 6, NULL,
- ai_run, 3, NULL
+ {ai_run, 1, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, -1, NULL},
+ {ai_run, -1, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, 1, NULL},
+ {ai_run, 3, NULL},
+ {ai_run, 6, NULL},
+ {ai_run, 3, NULL}
};
mmove_t chick_move_start_run = {FRAME_walk01, FRAME_walk10, chick_frames_start_run, chick_run};
mframe_t chick_frames_run [] =
{
- ai_run, 6, NULL,
- ai_run, 8, NULL,
- ai_run, 13, NULL,
- ai_run, 5, NULL,
- ai_run, 7, NULL,
- ai_run, 4, NULL,
- ai_run, 11, NULL,
- ai_run, 5, NULL,
- ai_run, 9, NULL,
- ai_run, 7, NULL
+ {ai_run, 6, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 5, NULL},
+ {ai_run, 7, NULL},
+ {ai_run, 4, NULL},
+ {ai_run, 11, NULL},
+ {ai_run, 5, NULL},
+ {ai_run, 9, NULL},
+ {ai_run, 7, NULL}
};
@@ -179,16 +179,16 @@
mframe_t chick_frames_walk [] =
{
- ai_walk, 6, NULL,
- ai_walk, 8, NULL,
- ai_walk, 13, NULL,
- ai_walk, 5, NULL,
- ai_walk, 7, NULL,
- ai_walk, 4, NULL,
- ai_walk, 11, NULL,
- ai_walk, 5, NULL,
- ai_walk, 9, NULL,
- ai_walk, 7, NULL
+ {ai_walk, 6, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 13, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 11, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 9, NULL},
+ {ai_walk, 7, NULL}
};
mmove_t chick_move_walk = {FRAME_walk11, FRAME_walk20, chick_frames_walk, NULL};
@@ -219,47 +219,47 @@
mframe_t chick_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t chick_move_pain1 = {FRAME_pain101, FRAME_pain105, chick_frames_pain1, chick_run};
mframe_t chick_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t chick_move_pain2 = {FRAME_pain201, FRAME_pain205, chick_frames_pain2, chick_run};
mframe_t chick_frames_pain3 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -6, NULL,
- ai_move, 3, NULL,
- ai_move, 11, NULL,
- ai_move, 3, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 4, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, -3, NULL,
- ai_move, -4, NULL,
- ai_move, 5, NULL,
- ai_move, 7, NULL,
- ai_move, -2, NULL,
- ai_move, 3, NULL,
- ai_move, -5, NULL,
- ai_move, -2, NULL,
- ai_move, -8, NULL,
- ai_move, 2, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 11, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, 7, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -8, NULL},
+ {ai_move, 2, NULL}
};
mmove_t chick_move_pain3 = {FRAME_pain301, FRAME_pain321, chick_frames_pain3, chick_run};
@@ -306,46 +306,46 @@
mframe_t chick_frames_death2 [] =
{
- ai_move, -6, NULL,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, -5, NULL,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, -2, NULL,
- ai_move, 1, NULL,
- ai_move, 10, NULL,
- ai_move, 2, NULL,
- ai_move, 3, NULL,
- ai_move, 1, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, 3, NULL,
- ai_move, 3, NULL,
- ai_move, 1, NULL,
- ai_move, -3, NULL,
- ai_move, -5, NULL,
- ai_move, 4, NULL,
- ai_move, 15, NULL,
- ai_move, 14, NULL,
- ai_move, 1, NULL
+ {ai_move, -6, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 10, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 15, NULL},
+ {ai_move, 14, NULL},
+ {ai_move, 1, NULL}
};
mmove_t chick_move_death2 = {FRAME_death201, FRAME_death223, chick_frames_death2, chick_dead};
mframe_t chick_frames_death1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -7, NULL,
- ai_move, 4, NULL,
- ai_move, 11, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -7, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 11, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t chick_move_death1 = {FRAME_death101, FRAME_death112, chick_frames_death1, chick_dead};
@@ -417,13 +417,13 @@
mframe_t chick_frames_duck [] =
{
- ai_move, 0, chick_duck_down,
- ai_move, 1, NULL,
- ai_move, 4, chick_duck_hold,
- ai_move, -4, NULL,
- ai_move, -5, chick_duck_up,
- ai_move, 3, NULL,
- ai_move, 1, NULL
+ {ai_move, 0, chick_duck_down},
+ {ai_move, 1, NULL},
+ {ai_move, 4, chick_duck_hold},
+ {ai_move, -4, NULL},
+ {ai_move, -5, chick_duck_up},
+ {ai_move, 3, NULL},
+ {ai_move, 1, NULL}
};
mmove_t chick_move_duck = {FRAME_duck01, FRAME_duck07, chick_frames_duck, chick_run};
@@ -479,50 +479,50 @@
mframe_t chick_frames_start_attack1 [] =
{
- ai_charge, 0, Chick_PreAttack1,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 4, NULL,
- ai_charge, 0, NULL,
- ai_charge, -3, NULL,
- ai_charge, 3, NULL,
- ai_charge, 5, NULL,
- ai_charge, 7, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, chick_attack1
+ {ai_charge, 0, Chick_PreAttack1},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 4, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -3, NULL},
+ {ai_charge, 3, NULL},
+ {ai_charge, 5, NULL},
+ {ai_charge, 7, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, chick_attack1}
};
mmove_t chick_move_start_attack1 = {FRAME_attak101, FRAME_attak113, chick_frames_start_attack1, NULL};
mframe_t chick_frames_attack1 [] =
{
- ai_charge, 19, ChickRocket,
- ai_charge, -6, NULL,
- ai_charge, -5, NULL,
- ai_charge, -2, NULL,
- ai_charge, -7, NULL,
- ai_charge, 0, NULL,
- ai_charge, 1, NULL,
- ai_charge, 10, ChickReload,
- ai_charge, 4, NULL,
- ai_charge, 5, NULL,
- ai_charge, 6, NULL,
- ai_charge, 6, NULL,
- ai_charge, 4, NULL,
- ai_charge, 3, chick_rerocket
+ {ai_charge, 19, ChickRocket},
+ {ai_charge, -6, NULL},
+ {ai_charge, -5, NULL},
+ {ai_charge, -2, NULL},
+ {ai_charge, -7, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 10, ChickReload},
+ {ai_charge, 4, NULL},
+ {ai_charge, 5, NULL},
+ {ai_charge, 6, NULL},
+ {ai_charge, 6, NULL},
+ {ai_charge, 4, NULL},
+ {ai_charge, 3, chick_rerocket}
};
mmove_t chick_move_attack1 = {FRAME_attak114, FRAME_attak127, chick_frames_attack1, NULL};
mframe_t chick_frames_end_attack1 [] =
{
- ai_charge, -3, NULL,
- ai_charge, 0, NULL,
- ai_charge, -6, NULL,
- ai_charge, -4, NULL,
- ai_charge, -2, NULL
+ {ai_charge, -3, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -6, NULL},
+ {ai_charge, -4, NULL},
+ {ai_charge, -2, NULL}
};
mmove_t chick_move_end_attack1 = {FRAME_attak128, FRAME_attak132, chick_frames_end_attack1, chick_run};
@@ -548,24 +548,24 @@
mframe_t chick_frames_slash [] =
{
- ai_charge, 1, NULL,
- ai_charge, 7, ChickSlash,
- ai_charge, -7, NULL,
- ai_charge, 1, NULL,
- ai_charge, -1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 0, NULL,
- ai_charge, 1, NULL,
- ai_charge, -2, chick_reslash
+ {ai_charge, 1, NULL},
+ {ai_charge, 7, ChickSlash},
+ {ai_charge, -7, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, -2, chick_reslash}
};
mmove_t chick_move_slash = {FRAME_attak204, FRAME_attak212, chick_frames_slash, NULL};
mframe_t chick_frames_end_slash [] =
{
- ai_charge, -6, NULL,
- ai_charge, -1, NULL,
- ai_charge, -6, NULL,
- ai_charge, 0, NULL
+ {ai_charge, -6, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, -6, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t chick_move_end_slash = {FRAME_attak213, FRAME_attak216, chick_frames_end_slash, chick_run};
@@ -599,9 +599,9 @@
mframe_t chick_frames_start_slash [] =
{
- ai_charge, 1, NULL,
- ai_charge, 8, NULL,
- ai_charge, 3, NULL
+ {ai_charge, 1, NULL},
+ {ai_charge, 8, NULL},
+ {ai_charge, 3, NULL}
};
mmove_t chick_move_start_slash = {FRAME_attak201, FRAME_attak203, chick_frames_start_slash, chick_slash};
Index: src/game/m_flipper.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_flipper.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_flipper.c
--- src/game/m_flipper.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_flipper.c 2002/02/19 21:12:35
@@ -43,7 +43,7 @@
mframe_t flipper_frames_stand [] =
{
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL}
};
mmove_t flipper_move_stand = {FRAME_flphor01, FRAME_flphor01, flipper_frames_stand, NULL};
@@ -57,32 +57,32 @@
mframe_t flipper_frames_run [] =
{
- ai_run, FLIPPER_RUN_SPEED, NULL, // 6
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL, // 10
-
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL, // 20
-
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL,
- ai_run, FLIPPER_RUN_SPEED, NULL // 29
+ {ai_run, FLIPPER_RUN_SPEED, NULL}, // 6
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL}, // 10
+
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL}, // 20
+
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL},
+ {ai_run, FLIPPER_RUN_SPEED, NULL} // 29
};
mmove_t flipper_move_run_loop = {FRAME_flpver06, FRAME_flpver29, flipper_frames_run, NULL};
@@ -93,12 +93,12 @@
mframe_t flipper_frames_run_start [] =
{
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL}
};
mmove_t flipper_move_run_start = {FRAME_flpver01, FRAME_flpver06, flipper_frames_run_start, flipper_run_loop};
@@ -110,30 +110,30 @@
/* Standard Swimming */
mframe_t flipper_frames_walk [] =
{
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL}
};
mmove_t flipper_move_walk = {FRAME_flphor01, FRAME_flphor24, flipper_frames_walk, NULL};
@@ -144,11 +144,11 @@
mframe_t flipper_frames_start_run [] =
{
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, NULL,
- ai_run, 8, flipper_run
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 8, flipper_run}
};
mmove_t flipper_move_start_run = {FRAME_flphor01, FRAME_flphor05, flipper_frames_start_run, NULL};
@@ -159,21 +159,21 @@
mframe_t flipper_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flipper_move_pain2 = {FRAME_flppn101, FRAME_flppn105, flipper_frames_pain2, flipper_run};
mframe_t flipper_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flipper_move_pain1 = {FRAME_flppn201, FRAME_flppn205, flipper_frames_pain1, flipper_run};
@@ -192,26 +192,26 @@
mframe_t flipper_frames_attack [] =
{
- ai_charge, 0, flipper_preattack,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, flipper_bite,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, flipper_bite,
- ai_charge, 0, NULL
+ {ai_charge, 0, flipper_preattack},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, flipper_bite},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, flipper_bite},
+ {ai_charge, 0, NULL}
};
mmove_t flipper_move_attack = {FRAME_flpbit01, FRAME_flpbit20, flipper_frames_attack, flipper_run};
@@ -260,67 +260,67 @@
mframe_t flipper_frames_death [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flipper_move_death = {FRAME_flpdth01, FRAME_flpdth56, flipper_frames_death, flipper_dead};
Index: src/game/m_float.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_float.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_float.c
--- src/game/m_float.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_float.c 2002/02/19 21:12:35
@@ -82,115 +82,115 @@
mframe_t floater_frames_stand1 [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t floater_move_stand1 = {FRAME_stand101, FRAME_stand152, floater_frames_stand1, NULL};
mframe_t floater_frames_stand2 [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t floater_move_stand2 = {FRAME_stand201, FRAME_stand252, floater_frames_stand2, NULL};
@@ -204,298 +204,298 @@
mframe_t floater_frames_activate [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t floater_move_activate = {FRAME_actvat01, FRAME_actvat31, floater_frames_activate, NULL};
mframe_t floater_frames_attack1 [] =
{
- ai_charge, 0, NULL, // Blaster attack
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, floater_fire_blaster, // BOOM (0, -25.8, 32.5) -- LOOP Starts
- ai_charge, 0, floater_fire_blaster,
- ai_charge, 0, floater_fire_blaster,
- ai_charge, 0, floater_fire_blaster,
- ai_charge, 0, floater_fire_blaster,
- ai_charge, 0, floater_fire_blaster,
- ai_charge, 0, floater_fire_blaster,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL // -- LOOP Ends
+ {ai_charge, 0, NULL}, // Blaster attack
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, floater_fire_blaster}, // BOOM (0, -25.8, 32.5) -- LOOP Starts
+ {ai_charge, 0, floater_fire_blaster},
+ {ai_charge, 0, floater_fire_blaster},
+ {ai_charge, 0, floater_fire_blaster},
+ {ai_charge, 0, floater_fire_blaster},
+ {ai_charge, 0, floater_fire_blaster},
+ {ai_charge, 0, floater_fire_blaster},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL} // -- LOOP Ends
};
mmove_t floater_move_attack1 = {FRAME_attak101, FRAME_attak114, floater_frames_attack1, floater_run};
mframe_t floater_frames_attack2 [] =
{
- ai_charge, 0, NULL, // Claws
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, floater_wham, // WHAM (0, -45, 29.6) -- LOOP Starts
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL, // -- LOOP Ends
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL}, // Claws
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, floater_wham}, // WHAM (0, -45, 29}.6) -- LOOP Starts
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}, // -- LOOP Ends
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t floater_move_attack2 = {FRAME_attak201, FRAME_attak225, floater_frames_attack2, floater_run};
mframe_t floater_frames_attack3 [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, floater_zap, // -- LOOP Starts
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL, // -- LOOP Ends
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, floater_zap}, // -- LOOP Starts
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}, // -- LOOP Ends
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t floater_move_attack3 = {FRAME_attak301, FRAME_attak334, floater_frames_attack3, floater_run};
mframe_t floater_frames_death [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t floater_move_death = {FRAME_death01, FRAME_death13, floater_frames_death, floater_dead};
mframe_t floater_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t floater_move_pain1 = {FRAME_pain101, FRAME_pain107, floater_frames_pain1, floater_run};
mframe_t floater_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t floater_move_pain2 = {FRAME_pain201, FRAME_pain208, floater_frames_pain2, floater_run};
mframe_t floater_frames_pain3 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t floater_move_pain3 = {FRAME_pain301, FRAME_pain312, floater_frames_pain3, floater_run};
mframe_t floater_frames_walk [] =
{
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL}
};
mmove_t floater_move_walk = {FRAME_stand101, FRAME_stand152, floater_frames_walk, NULL};
mframe_t floater_frames_run [] =
{
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL,
- ai_run, 13, NULL
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 13, NULL}
};
mmove_t floater_move_run = {FRAME_stand101, FRAME_stand152, floater_frames_run, NULL};
Index: src/game/m_flyer.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_flyer.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_flyer.c
--- src/game/m_flyer.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_flyer.c 2002/02/19 21:12:35
@@ -67,152 +67,152 @@
mframe_t flyer_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t flyer_move_stand = {FRAME_stand01, FRAME_stand45, flyer_frames_stand, NULL};
mframe_t flyer_frames_walk [] =
{
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL}
};
mmove_t flyer_move_walk = {FRAME_stand01, FRAME_stand45, flyer_frames_walk, NULL};
mframe_t flyer_frames_run [] =
{
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL}
};
mmove_t flyer_move_run = {FRAME_stand01, FRAME_stand45, flyer_frames_run, NULL};
@@ -236,24 +236,24 @@
mframe_t flyer_frames_start [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, flyer_nextmove
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, flyer_nextmove}
};
mmove_t flyer_move_start = {FRAME_start01, FRAME_start06, flyer_frames_start, NULL};
mframe_t flyer_frames_stop [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, flyer_nextmove
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, flyer_nextmove}
};
mmove_t flyer_move_stop = {FRAME_stop01, FRAME_stop07, flyer_frames_stop, NULL};
@@ -270,96 +270,96 @@
mframe_t flyer_frames_rollright [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flyer_move_rollright = {FRAME_rollr01, FRAME_rollr09, flyer_frames_rollright, NULL};
mframe_t flyer_frames_rollleft [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flyer_move_rollleft = {FRAME_rollf01, FRAME_rollf09, flyer_frames_rollleft, NULL};
mframe_t flyer_frames_pain3 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flyer_move_pain3 = {FRAME_pain301, FRAME_pain304, flyer_frames_pain3, flyer_run};
mframe_t flyer_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flyer_move_pain2 = {FRAME_pain201, FRAME_pain204, flyer_frames_pain2, flyer_run};
mframe_t flyer_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flyer_move_pain1 = {FRAME_pain101, FRAME_pain109, flyer_frames_pain1, flyer_run};
mframe_t flyer_frames_defense [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // Hold this frame
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // Hold this frame
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flyer_move_defense = {FRAME_defens01, FRAME_defens06, flyer_frames_defense, NULL};
mframe_t flyer_frames_bankright [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flyer_move_bankright = {FRAME_bankr01, FRAME_bankr07, flyer_frames_bankright, NULL};
mframe_t flyer_frames_bankleft [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t flyer_move_bankleft = {FRAME_bankl01, FRAME_bankl07, flyer_frames_bankleft, NULL};
@@ -399,23 +399,23 @@
mframe_t flyer_frames_attack2 [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, -10, flyer_fireleft, // left gun
- ai_charge, -10, flyer_fireright, // right gun
- ai_charge, -10, flyer_fireleft, // left gun
- ai_charge, -10, flyer_fireright, // right gun
- ai_charge, -10, flyer_fireleft, // left gun
- ai_charge, -10, flyer_fireright, // right gun
- ai_charge, -10, flyer_fireleft, // left gun
- ai_charge, -10, flyer_fireright, // right gun
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -10, flyer_fireleft}, // left gun
+ {ai_charge, -10, flyer_fireright}, // right gun
+ {ai_charge, -10, flyer_fireleft}, // left gun
+ {ai_charge, -10, flyer_fireright}, // right gun
+ {ai_charge, -10, flyer_fireleft}, // left gun
+ {ai_charge, -10, flyer_fireright}, // right gun
+ {ai_charge, -10, flyer_fireleft}, // left gun
+ {ai_charge, -10, flyer_fireright}, // right gun
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t flyer_move_attack2 = {FRAME_attak201, FRAME_attak217, flyer_frames_attack2, flyer_run};
@@ -440,38 +440,38 @@
mframe_t flyer_frames_start_melee [] =
{
- ai_charge, 0, flyer_pop_blades,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, flyer_pop_blades},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t flyer_move_start_melee = {FRAME_attak101, FRAME_attak106, flyer_frames_start_melee, flyer_loop_melee};
mframe_t flyer_frames_end_melee [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t flyer_move_end_melee = {FRAME_attak119, FRAME_attak121, flyer_frames_end_melee, flyer_run};
mframe_t flyer_frames_loop_melee [] =
{
- ai_charge, 0, NULL, // Loop Start
- ai_charge, 0, NULL,
- ai_charge, 0, flyer_slash_left, // Left Wing Strike
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, flyer_slash_right, // Right Wing Strike
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL // Loop Ends
+ {ai_charge, 0, NULL}, // Loop Start
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, flyer_slash_left}, // Left Wing Strike
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, flyer_slash_right}, // Right Wing Strike
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL} // Loop Ends
};
mmove_t flyer_move_loop_melee = {FRAME_attak107, FRAME_attak118, flyer_frames_loop_melee, flyer_check_melee};
Index: src/game/m_gladiator.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_gladiator.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_gladiator.c
--- src/game/m_gladiator.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_gladiator.c 2002/02/19 21:12:36
@@ -63,13 +63,13 @@
mframe_t gladiator_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t gladiator_move_stand = {FRAME_stand1, FRAME_stand7, gladiator_frames_stand, NULL};
@@ -81,22 +81,22 @@
mframe_t gladiator_frames_walk [] =
{
- ai_walk, 15, NULL,
- ai_walk, 7, NULL,
- ai_walk, 6, NULL,
- ai_walk, 5, NULL,
- ai_walk, 2, NULL,
- ai_walk, 0, NULL,
- ai_walk, 2, NULL,
- ai_walk, 8, NULL,
- ai_walk, 12, NULL,
- ai_walk, 8, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 2, NULL,
- ai_walk, 2, NULL,
- ai_walk, 1, NULL,
- ai_walk, 8, NULL
+ {ai_walk, 15, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 12, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 8, NULL}
};
mmove_t gladiator_move_walk = {FRAME_walk1, FRAME_walk16, gladiator_frames_walk, NULL};
@@ -108,12 +108,12 @@
mframe_t gladiator_frames_run [] =
{
- ai_run, 23, NULL,
- ai_run, 14, NULL,
- ai_run, 14, NULL,
- ai_run, 21, NULL,
- ai_run, 12, NULL,
- ai_run, 13, NULL
+ {ai_run, 23, NULL},
+ {ai_run, 14, NULL},
+ {ai_run, 14, NULL},
+ {ai_run, 21, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 13, NULL}
};
mmove_t gladiator_move_run = {FRAME_run1, FRAME_run6, gladiator_frames_run, NULL};
@@ -139,23 +139,23 @@
mframe_t gladiator_frames_attack_melee [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, gladiator_cleaver_swing,
- ai_charge, 0, NULL,
- ai_charge, 0, GaldiatorMelee,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, gladiator_cleaver_swing,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, GaldiatorMelee,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, gladiator_cleaver_swing},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, GaldiatorMelee},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, gladiator_cleaver_swing},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, GaldiatorMelee},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t gladiator_move_attack_melee = {FRAME_melee1, FRAME_melee17, gladiator_frames_attack_melee, gladiator_run};
@@ -183,15 +183,15 @@
mframe_t gladiator_frames_attack_gun [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, GladiatorGun,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, GladiatorGun},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t gladiator_move_attack_gun = {FRAME_attack1, FRAME_attack9, gladiator_frames_attack_gun, gladiator_run};
@@ -216,24 +216,24 @@
mframe_t gladiator_frames_pain [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t gladiator_move_pain = {FRAME_pain1, FRAME_pain6, gladiator_frames_pain, gladiator_run};
mframe_t gladiator_frames_pain_air [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t gladiator_move_pain_air = {FRAME_painup1, FRAME_painup7, gladiator_frames_pain_air, gladiator_run};
@@ -280,28 +280,28 @@
mframe_t gladiator_frames_death [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t gladiator_move_death = {FRAME_death1, FRAME_death22, gladiator_frames_death, gladiator_dead};
Index: src/game/m_gunner.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_gunner.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_gunner.c
--- src/game/m_gunner.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_gunner.c 2002/02/19 21:12:36
@@ -65,59 +65,59 @@
mframe_t gunner_frames_fidget [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, gunner_idlesound,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, gunner_idlesound},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t gunner_move_fidget = {FRAME_stand31, FRAME_stand70, gunner_frames_fidget, gunner_stand};
@@ -131,38 +131,38 @@
mframe_t gunner_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, gunner_fidget,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, gunner_fidget,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, gunner_fidget
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, gunner_fidget},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, gunner_fidget},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, gunner_fidget}
};
mmove_t gunner_move_stand = {FRAME_stand01, FRAME_stand30, gunner_frames_stand, NULL};
@@ -174,19 +174,19 @@
mframe_t gunner_frames_walk [] =
{
- ai_walk, 0, NULL,
- ai_walk, 3, NULL,
- ai_walk, 4, NULL,
- ai_walk, 5, NULL,
- ai_walk, 7, NULL,
- ai_walk, 2, NULL,
- ai_walk, 6, NULL,
- ai_walk, 4, NULL,
- ai_walk, 2, NULL,
- ai_walk, 7, NULL,
- ai_walk, 5, NULL,
- ai_walk, 7, NULL,
- ai_walk, 4, NULL
+ {ai_walk, 0, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 4, NULL}
};
mmove_t gunner_move_walk = {FRAME_walk07, FRAME_walk19, gunner_frames_walk, NULL};
@@ -197,14 +197,14 @@
mframe_t gunner_frames_run [] =
{
- ai_run, 26, NULL,
- ai_run, 9, NULL,
- ai_run, 9, NULL,
- ai_run, 9, NULL,
- ai_run, 15, NULL,
- ai_run, 10, NULL,
- ai_run, 13, NULL,
- ai_run, 6, NULL
+ {ai_run, 26, NULL},
+ {ai_run, 9, NULL},
+ {ai_run, 9, NULL},
+ {ai_run, 9, NULL},
+ {ai_run, 15, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 13, NULL},
+ {ai_run, 6, NULL}
};
mmove_t gunner_move_run = {FRAME_run01, FRAME_run08, gunner_frames_run, NULL};
@@ -219,12 +219,12 @@
mframe_t gunner_frames_runandshoot [] =
{
- ai_run, 32, NULL,
- ai_run, 15, NULL,
- ai_run, 10, NULL,
- ai_run, 18, NULL,
- ai_run, 8, NULL,
- ai_run, 20, NULL
+ {ai_run, 32, NULL},
+ {ai_run, 15, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 18, NULL},
+ {ai_run, 8, NULL},
+ {ai_run, 20, NULL}
};
mmove_t gunner_move_runandshoot = {FRAME_runs01, FRAME_runs06, gunner_frames_runandshoot, NULL};
@@ -236,47 +236,47 @@
mframe_t gunner_frames_pain3 [] =
{
- ai_move, -3, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, 1, NULL
+ {ai_move, -3, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 1, NULL}
};
mmove_t gunner_move_pain3 = {FRAME_pain301, FRAME_pain305, gunner_frames_pain3, gunner_run};
mframe_t gunner_frames_pain2 [] =
{
- ai_move, -2, NULL,
- ai_move, 11, NULL,
- ai_move, 6, NULL,
- ai_move, 2, NULL,
- ai_move, -1, NULL,
- ai_move, -7, NULL,
- ai_move, -2, NULL,
- ai_move, -7, NULL
+ {ai_move, -2, NULL},
+ {ai_move, 11, NULL},
+ {ai_move, 6, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -7, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -7, NULL}
};
mmove_t gunner_move_pain2 = {FRAME_pain201, FRAME_pain208, gunner_frames_pain2, gunner_run};
mframe_t gunner_frames_pain1 [] =
{
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, -5, NULL,
- ai_move, 3, NULL,
- ai_move, -1, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, 2, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, -2, NULL,
- ai_move, -2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t gunner_move_pain1 = {FRAME_pain101, FRAME_pain118, gunner_frames_pain1, gunner_run};
@@ -318,17 +318,17 @@
mframe_t gunner_frames_death [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -7, NULL,
- ai_move, -3, NULL,
- ai_move, -5, NULL,
- ai_move, 8, NULL,
- ai_move, 6, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -7, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, 8, NULL},
+ {ai_move, 6, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t gunner_move_death = {FRAME_death01, FRAME_death11, gunner_frames_death, gunner_dead};
@@ -395,14 +395,14 @@
mframe_t gunner_frames_duck [] =
{
- ai_move, 1, gunner_duck_down,
- ai_move, 1, NULL,
- ai_move, 1, gunner_duck_hold,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, 0, gunner_duck_up,
- ai_move, -1, NULL
+ {ai_move, 1, gunner_duck_down},
+ {ai_move, 1, NULL},
+ {ai_move, 1, gunner_duck_hold},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 0, gunner_duck_up},
+ {ai_move, -1, NULL}
};
mmove_t gunner_move_duck = {FRAME_duck01, FRAME_duck08, gunner_frames_duck, gunner_run};
@@ -474,73 +474,73 @@
mframe_t gunner_frames_attack_chain [] =
{
/*
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
*/
- ai_charge, 0, gunner_opengun,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, gunner_opengun},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t gunner_move_attack_chain = {FRAME_attak209, FRAME_attak215, gunner_frames_attack_chain, gunner_fire_chain};
mframe_t gunner_frames_fire_chain [] =
{
- ai_charge, 0, GunnerFire,
- ai_charge, 0, GunnerFire,
- ai_charge, 0, GunnerFire,
- ai_charge, 0, GunnerFire,
- ai_charge, 0, GunnerFire,
- ai_charge, 0, GunnerFire,
- ai_charge, 0, GunnerFire,
- ai_charge, 0, GunnerFire
+ {ai_charge, 0, GunnerFire},
+ {ai_charge, 0, GunnerFire},
+ {ai_charge, 0, GunnerFire},
+ {ai_charge, 0, GunnerFire},
+ {ai_charge, 0, GunnerFire},
+ {ai_charge, 0, GunnerFire},
+ {ai_charge, 0, GunnerFire},
+ {ai_charge, 0, GunnerFire}
};
mmove_t gunner_move_fire_chain = {FRAME_attak216, FRAME_attak223, gunner_frames_fire_chain, gunner_refire_chain};
mframe_t gunner_frames_endfire_chain [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t gunner_move_endfire_chain = {FRAME_attak224, FRAME_attak230, gunner_frames_endfire_chain, gunner_run};
mframe_t gunner_frames_attack_grenade [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, GunnerGrenade,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, GunnerGrenade,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, GunnerGrenade,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, GunnerGrenade,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, GunnerGrenade},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, GunnerGrenade},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, GunnerGrenade},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, GunnerGrenade},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t gunner_move_attack_grenade = {FRAME_attak101, FRAME_attak121, gunner_frames_attack_grenade, gunner_run};
Index: src/game/m_hover.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_hover.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_hover.c
--- src/game/m_hover.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_hover.c 2002/02/19 21:12:36
@@ -64,357 +64,357 @@
mframe_t hover_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t hover_move_stand = {FRAME_stand01, FRAME_stand30, hover_frames_stand, NULL};
mframe_t hover_frames_stop1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t hover_move_stop1 = {FRAME_stop101, FRAME_stop109, hover_frames_stop1, NULL};
mframe_t hover_frames_stop2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t hover_move_stop2 = {FRAME_stop201, FRAME_stop208, hover_frames_stop2, NULL};
mframe_t hover_frames_takeoff [] =
{
- ai_move, 0, NULL,
- ai_move, -2, NULL,
- ai_move, 5, NULL,
- ai_move, -1, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 2, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, -6, NULL,
- ai_move, -9, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 2, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 3, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, -9, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL}
};
mmove_t hover_move_takeoff = {FRAME_takeof01, FRAME_takeof30, hover_frames_takeoff, NULL};
mframe_t hover_frames_pain3 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t hover_move_pain3 = {FRAME_pain301, FRAME_pain309, hover_frames_pain3, hover_run};
mframe_t hover_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t hover_move_pain2 = {FRAME_pain201, FRAME_pain212, hover_frames_pain2, hover_run};
mframe_t hover_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, -8, NULL,
- ai_move, -4, NULL,
- ai_move, -6, NULL,
- ai_move, -4, NULL,
- ai_move, -3, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 3, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 3, NULL,
- ai_move, 2, NULL,
- ai_move, 7, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 5, NULL,
- ai_move, 3, NULL,
- ai_move, 4, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, -8, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 7, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 4, NULL}
};
mmove_t hover_move_pain1 = {FRAME_pain101, FRAME_pain128, hover_frames_pain1, hover_run};
mframe_t hover_frames_land [] =
{
- ai_move, 0, NULL
+ {ai_move, 0, NULL}
};
mmove_t hover_move_land = {FRAME_land01, FRAME_land01, hover_frames_land, NULL};
mframe_t hover_frames_forward [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t hover_move_forward = {FRAME_forwrd01, FRAME_forwrd35, hover_frames_forward, NULL};
mframe_t hover_frames_walk [] =
{
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL}
};
mmove_t hover_move_walk = {FRAME_forwrd01, FRAME_forwrd35, hover_frames_walk, NULL};
mframe_t hover_frames_run [] =
{
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL,
- ai_run, 10, NULL
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 10, NULL}
};
mmove_t hover_move_run = {FRAME_forwrd01, FRAME_forwrd35, hover_frames_run, NULL};
mframe_t hover_frames_death1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -10,NULL,
- ai_move, 3, NULL,
- ai_move, 5, NULL,
- ai_move, 4, NULL,
- ai_move, 7, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -10,NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 7, NULL}
};
mmove_t hover_move_death1 = {FRAME_death101, FRAME_death111, hover_frames_death1, hover_dead};
mframe_t hover_frames_backward [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t hover_move_backward = {FRAME_backwd01, FRAME_backwd24, hover_frames_backward, NULL};
mframe_t hover_frames_start_attack [] =
{
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL}
};
mmove_t hover_move_start_attack = {FRAME_attak101, FRAME_attak103, hover_frames_start_attack, hover_attack};
mframe_t hover_frames_attack1 [] =
{
- ai_charge, -10, hover_fire_blaster,
- ai_charge, -10, hover_fire_blaster,
- ai_charge, 0, hover_reattack,
+ {ai_charge, -10, hover_fire_blaster},
+ {ai_charge, -10, hover_fire_blaster},
+ {ai_charge, 0, hover_reattack},
};
mmove_t hover_move_attack1 = {FRAME_attak104, FRAME_attak106, hover_frames_attack1, NULL};
mframe_t hover_frames_end_attack [] =
{
- ai_charge, 1, NULL,
- ai_charge, 1, NULL
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL}
};
mmove_t hover_move_end_attack = {FRAME_attak107, FRAME_attak108, hover_frames_end_attack, hover_run};
Index: src/game/m_infantry.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_infantry.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_infantry.c
--- src/game/m_infantry.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_infantry.c 2002/02/19 21:12:36
@@ -47,28 +47,28 @@
mframe_t infantry_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t infantry_move_stand = {FRAME_stand50, FRAME_stand71, infantry_frames_stand, NULL};
@@ -80,55 +80,55 @@
mframe_t infantry_frames_fidget [] =
{
- ai_stand, 1, NULL,
- ai_stand, 0, NULL,
- ai_stand, 1, NULL,
- ai_stand, 3, NULL,
- ai_stand, 6, NULL,
- ai_stand, 3, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 1, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 1, NULL,
- ai_stand, 0, NULL,
- ai_stand, -1, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 1, NULL,
- ai_stand, 0, NULL,
- ai_stand, -2, NULL,
- ai_stand, 1, NULL,
- ai_stand, 1, NULL,
- ai_stand, 1, NULL,
- ai_stand, -1, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, -1, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, -1, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 1, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, -1, NULL,
- ai_stand, -1, NULL,
- ai_stand, 0, NULL,
- ai_stand, -3, NULL,
- ai_stand, -2, NULL,
- ai_stand, -3, NULL,
- ai_stand, -3, NULL,
- ai_stand, -2, NULL
+ {ai_stand, 1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 1, NULL},
+ {ai_stand, 3, NULL},
+ {ai_stand, 6, NULL},
+ {ai_stand, 3, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, -1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, -2, NULL},
+ {ai_stand, 1, NULL},
+ {ai_stand, 1, NULL},
+ {ai_stand, 1, NULL},
+ {ai_stand, -1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, -1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, -1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, -1, NULL},
+ {ai_stand, -1, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, -3, NULL},
+ {ai_stand, -2, NULL},
+ {ai_stand, -3, NULL},
+ {ai_stand, -3, NULL},
+ {ai_stand, -2, NULL}
};
mmove_t infantry_move_fidget = {FRAME_stand01, FRAME_stand49, infantry_frames_fidget, infantry_stand};
@@ -140,18 +140,18 @@
mframe_t infantry_frames_walk [] =
{
- ai_walk, 5, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 5, NULL,
- ai_walk, 4, NULL,
- ai_walk, 5, NULL,
- ai_walk, 6, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 5, NULL
+ {ai_walk, 5, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 5, NULL}
};
mmove_t infantry_move_walk = {FRAME_walk03, FRAME_walk14, infantry_frames_walk, NULL};
@@ -162,14 +162,14 @@
mframe_t infantry_frames_run [] =
{
- ai_run, 10, NULL,
- ai_run, 20, NULL,
- ai_run, 5, NULL,
- ai_run, 7, NULL,
- ai_run, 30, NULL,
- ai_run, 35, NULL,
- ai_run, 2, NULL,
- ai_run, 6, NULL
+ {ai_run, 10, NULL},
+ {ai_run, 20, NULL},
+ {ai_run, 5, NULL},
+ {ai_run, 7, NULL},
+ {ai_run, 30, NULL},
+ {ai_run, 35, NULL},
+ {ai_run, 2, NULL},
+ {ai_run, 6, NULL}
};
mmove_t infantry_move_run = {FRAME_run01, FRAME_run08, infantry_frames_run, NULL};
@@ -184,31 +184,31 @@
mframe_t infantry_frames_pain1 [] =
{
- ai_move, -3, NULL,
- ai_move, -2, NULL,
- ai_move, -1, NULL,
- ai_move, -2, NULL,
- ai_move, -1, NULL,
- ai_move, 1, NULL,
- ai_move, -1, NULL,
- ai_move, 1, NULL,
- ai_move, 6, NULL,
- ai_move, 2, NULL
+ {ai_move, -3, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 6, NULL},
+ {ai_move, 2, NULL}
};
mmove_t infantry_move_pain1 = {FRAME_pain101, FRAME_pain110, infantry_frames_pain1, infantry_run};
mframe_t infantry_frames_pain2 [] =
{
- ai_move, -3, NULL,
- ai_move, -3, NULL,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, -2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 5, NULL,
- ai_move, 2, NULL
+ {ai_move, -3, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, 2, NULL}
};
mmove_t infantry_move_pain2 = {FRAME_pain201, FRAME_pain210, infantry_frames_pain2, infantry_run};
@@ -243,18 +243,18 @@
vec3_t aimangles[] =
{
- 0.0, 5.0, 0.0,
- 10.0, 15.0, 0.0,
- 20.0, 25.0, 0.0,
- 25.0, 35.0, 0.0,
- 30.0, 40.0, 0.0,
- 30.0, 45.0, 0.0,
- 25.0, 50.0, 0.0,
- 20.0, 40.0, 0.0,
- 15.0, 35.0, 0.0,
- 40.0, 35.0, 0.0,
- 70.0, 35.0, 0.0,
- 90.0, 35.0, 0.0
+ {0.0, 5.0, 0.0},
+ {10.0, 15.0, 0.0},
+ {20.0, 25.0, 0.0},
+ {25.0, 35.0, 0.0},
+ {30.0, 40.0, 0.0},
+ {30.0, 45.0, 0.0},
+ {25.0, 50.0, 0.0},
+ {20.0, 40.0, 0.0},
+ {15.0, 35.0, 0.0},
+ {40.0, 35.0, 0.0},
+ {70.0, 35.0, 0.0},
+ {90.0, 35.0, 0.0}
};
void InfantryMachineGun (edict_t *self)
@@ -314,71 +314,71 @@
mframe_t infantry_frames_death1 [] =
{
- ai_move, -4, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, -4, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, 3, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, -2, NULL,
- ai_move, 2, NULL,
- ai_move, 2, NULL,
- ai_move, 9, NULL,
- ai_move, 9, NULL,
- ai_move, 5, NULL,
- ai_move, -3, NULL,
- ai_move, -3, NULL
+ {ai_move, -4, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 9, NULL},
+ {ai_move, 9, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, -3, NULL}
};
mmove_t infantry_move_death1 = {FRAME_death101, FRAME_death120, infantry_frames_death1, infantry_dead};
// Off with his head
mframe_t infantry_frames_death2 [] =
{
- ai_move, 0, NULL,
- ai_move, 1, NULL,
- ai_move, 5, NULL,
- ai_move, -1, NULL,
- ai_move, 0, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, 4, NULL,
- ai_move, 3, NULL,
- ai_move, 0, NULL,
- ai_move, -2, InfantryMachineGun,
- ai_move, -2, InfantryMachineGun,
- ai_move, -3, InfantryMachineGun,
- ai_move, -1, InfantryMachineGun,
- ai_move, -2, InfantryMachineGun,
- ai_move, 0, InfantryMachineGun,
- ai_move, 2, InfantryMachineGun,
- ai_move, 2, InfantryMachineGun,
- ai_move, 3, InfantryMachineGun,
- ai_move, -10, InfantryMachineGun,
- ai_move, -7, InfantryMachineGun,
- ai_move, -8, InfantryMachineGun,
- ai_move, -6, NULL,
- ai_move, 4, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -2, InfantryMachineGun},
+ {ai_move, -2, InfantryMachineGun},
+ {ai_move, -3, InfantryMachineGun},
+ {ai_move, -1, InfantryMachineGun},
+ {ai_move, -2, InfantryMachineGun},
+ {ai_move, 0, InfantryMachineGun},
+ {ai_move, 2, InfantryMachineGun},
+ {ai_move, 2, InfantryMachineGun},
+ {ai_move, 3, InfantryMachineGun},
+ {ai_move, -10, InfantryMachineGun},
+ {ai_move, -7, InfantryMachineGun},
+ {ai_move, -8, InfantryMachineGun},
+ {ai_move, -6, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 0, NULL}
};
mmove_t infantry_move_death2 = {FRAME_death201, FRAME_death225, infantry_frames_death2, infantry_dead};
mframe_t infantry_frames_death3 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -6, NULL,
- ai_move, -11, NULL,
- ai_move, -3, NULL,
- ai_move, -11, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, -11, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, -11, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t infantry_move_death3 = {FRAME_death301, FRAME_death309, infantry_frames_death3, infantry_dead};
@@ -455,11 +455,11 @@
mframe_t infantry_frames_duck [] =
{
- ai_move, -2, infantry_duck_down,
- ai_move, -5, infantry_duck_hold,
- ai_move, 3, NULL,
- ai_move, 4, infantry_duck_up,
- ai_move, 0, NULL
+ {ai_move, -2, infantry_duck_down},
+ {ai_move, -5, infantry_duck_hold},
+ {ai_move, 3, NULL},
+ {ai_move, 4, infantry_duck_up},
+ {ai_move, 0, NULL}
};
mmove_t infantry_move_duck = {FRAME_duck01, FRAME_duck05, infantry_frames_duck, infantry_run};
@@ -496,21 +496,21 @@
mframe_t infantry_frames_attack1 [] =
{
- ai_charge, 4, NULL,
- ai_charge, -1, NULL,
- ai_charge, -1, NULL,
- ai_charge, 0, infantry_cock_gun,
- ai_charge, -1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 2, NULL,
- ai_charge, -2, NULL,
- ai_charge, -3, NULL,
- ai_charge, 1, infantry_fire,
- ai_charge, 5, NULL,
- ai_charge, -1, NULL,
- ai_charge, -2, NULL,
- ai_charge, -3, NULL
+ {ai_charge, 4, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, 0, infantry_cock_gun},
+ {ai_charge, -1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 2, NULL},
+ {ai_charge, -2, NULL},
+ {ai_charge, -3, NULL},
+ {ai_charge, 1, infantry_fire},
+ {ai_charge, 5, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, -2, NULL},
+ {ai_charge, -3, NULL}
};
mmove_t infantry_move_attack1 = {FRAME_attak101, FRAME_attak115, infantry_frames_attack1, infantry_run};
@@ -531,14 +531,14 @@
mframe_t infantry_frames_attack2 [] =
{
- ai_charge, 3, NULL,
- ai_charge, 6, NULL,
- ai_charge, 0, infantry_swing,
- ai_charge, 8, NULL,
- ai_charge, 5, NULL,
- ai_charge, 8, infantry_smack,
- ai_charge, 6, NULL,
- ai_charge, 3, NULL,
+ {ai_charge, 3, NULL},
+ {ai_charge, 6, NULL},
+ {ai_charge, 0, infantry_swing},
+ {ai_charge, 8, NULL},
+ {ai_charge, 5, NULL},
+ {ai_charge, 8, infantry_smack},
+ {ai_charge, 6, NULL},
+ {ai_charge, 3, NULL},
};
mmove_t infantry_move_attack2 = {FRAME_attak201, FRAME_attak208, infantry_frames_attack2, infantry_run};
Index: src/game/m_insane.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_insane.c,v
retrieving revision 1.2
diff -u -r1.2 m_insane.c
--- src/game/m_insane.c 2002/01/03 05:10:14 1.2
+++ src/game/m_insane.c 2002/02/19 21:12:36
@@ -67,367 +67,367 @@
mframe_t insane_frames_stand_normal [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, insane_checkdown
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, insane_checkdown}
};
mmove_t insane_move_stand_normal = {FRAME_stand60, FRAME_stand65, insane_frames_stand_normal, insane_stand};
mframe_t insane_frames_stand_insane [] =
{
- ai_stand, 0, insane_shake,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, insane_checkdown
+ {ai_stand, 0, insane_shake},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, insane_checkdown}
};
mmove_t insane_move_stand_insane = {FRAME_stand65, FRAME_stand94, insane_frames_stand_insane, insane_stand};
mframe_t insane_frames_uptodown [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, insane_moan,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 2.7, NULL,
- ai_move, 4.1, NULL,
- ai_move, 6, NULL,
- ai_move, 7.6, NULL,
- ai_move, 3.6, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, insane_fist,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, insane_fist,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, insane_moan},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 2.7, NULL},
+ {ai_move, 4.1, NULL},
+ {ai_move, 6, NULL},
+ {ai_move, 7.6, NULL},
+ {ai_move, 3.6, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, insane_fist},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, insane_fist},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t insane_move_uptodown = {FRAME_stand1, FRAME_stand40, insane_frames_uptodown, insane_onground};
mframe_t insane_frames_downtoup [] =
{
- ai_move, -0.7, NULL, // 41
- ai_move, -1.2, NULL, // 42
- ai_move, -1.5, NULL, // 43
- ai_move, -4.5, NULL, // 44
- ai_move, -3.5, NULL, // 45
- ai_move, -0.2, NULL, // 46
- ai_move, 0, NULL, // 47
- ai_move, -1.3, NULL, // 48
- ai_move, -3, NULL, // 49
- ai_move, -2, NULL, // 50
- ai_move, 0, NULL, // 51
- ai_move, 0, NULL, // 52
- ai_move, 0, NULL, // 53
- ai_move, -3.3, NULL, // 54
- ai_move, -1.6, NULL, // 55
- ai_move, -0.3, NULL, // 56
- ai_move, 0, NULL, // 57
- ai_move, 0, NULL, // 58
- ai_move, 0, NULL // 59
+ {ai_move, -0.7, NULL}, // 41
+ {ai_move, -1.2, NULL}, // 42
+ {ai_move, -1.5, NULL}, // 43
+ {ai_move, -4.5, NULL}, // 44
+ {ai_move, -3.5, NULL}, // 45
+ {ai_move, -0.2, NULL}, // 46
+ {ai_move, 0, NULL}, // 47
+ {ai_move, -1.3, NULL}, // 48
+ {ai_move, -3, NULL}, // 49
+ {ai_move, -2, NULL}, // 50
+ {ai_move, 0, NULL}, // 51
+ {ai_move, 0, NULL}, // 52
+ {ai_move, 0, NULL}, // 53
+ {ai_move, -3.3, NULL}, // 54
+ {ai_move, -1.6, NULL}, // 55
+ {ai_move, -0.3, NULL}, // 56
+ {ai_move, 0, NULL}, // 57
+ {ai_move, 0, NULL}, // 58
+ {ai_move, 0, NULL} // 59
};
mmove_t insane_move_downtoup = {FRAME_stand41, FRAME_stand59, insane_frames_downtoup, insane_stand};
mframe_t insane_frames_jumpdown [] =
{
- ai_move, 0.2, NULL,
- ai_move, 11.5, NULL,
- ai_move, 5.1, NULL,
- ai_move, 7.1, NULL,
- ai_move, 0, NULL
+ {ai_move, 0.2, NULL},
+ {ai_move, 11.5, NULL},
+ {ai_move, 5.1, NULL},
+ {ai_move, 7.1, NULL},
+ {ai_move, 0, NULL}
};
mmove_t insane_move_jumpdown = {FRAME_stand96, FRAME_stand100, insane_frames_jumpdown, insane_onground};
mframe_t insane_frames_down [] =
{
- ai_move, 0, NULL, // 100
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 110
- ai_move, -1.7, NULL,
- ai_move, -1.6, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, insane_fist,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 120
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 130
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, insane_moan,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 140
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL, // 150
- ai_move, 0.5, NULL,
- ai_move, 0, NULL,
- ai_move, -0.2, insane_scream,
- ai_move, 0, NULL,
- ai_move, 0.2, NULL,
- ai_move, 0.4, NULL,
- ai_move, 0.6, NULL,
- ai_move, 0.8, NULL,
- ai_move, 0.7, NULL,
- ai_move, 0, insane_checkup // 160
+ {ai_move, 0, NULL}, // 100
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 110
+ {ai_move, -1.7, NULL},
+ {ai_move, -1.6, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, insane_fist},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 120
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 130
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, insane_moan},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 140
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}, // 150
+ {ai_move, 0.5, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -0.2, insane_scream},
+ {ai_move, 0, NULL},
+ {ai_move, 0.2, NULL},
+ {ai_move, 0.4, NULL},
+ {ai_move, 0.6, NULL},
+ {ai_move, 0.8, NULL},
+ {ai_move, 0.7, NULL},
+ {ai_move, 0, insane_checkup} // 160
};
mmove_t insane_move_down = {FRAME_stand100, FRAME_stand160, insane_frames_down, insane_onground};
mframe_t insane_frames_walk_normal [] =
{
- ai_walk, 0, insane_scream,
- ai_walk, 2.5, NULL,
- ai_walk, 3.5, NULL,
- ai_walk, 1.7, NULL,
- ai_walk, 2.3, NULL,
- ai_walk, 2.4, NULL,
- ai_walk, 2.2, NULL,
- ai_walk, 4.2, NULL,
- ai_walk, 5.6, NULL,
- ai_walk, 3.3, NULL,
- ai_walk, 2.4, NULL,
- ai_walk, 0.9, NULL,
- ai_walk, 0, NULL
+ {ai_walk, 0, insane_scream},
+ {ai_walk, 2.5, NULL},
+ {ai_walk, 3.5, NULL},
+ {ai_walk, 1.7, NULL},
+ {ai_walk, 2.3, NULL},
+ {ai_walk, 2.4, NULL},
+ {ai_walk, 2.2, NULL},
+ {ai_walk, 4.2, NULL},
+ {ai_walk, 5.6, NULL},
+ {ai_walk, 3.3, NULL},
+ {ai_walk, 2.4, NULL},
+ {ai_walk, 0.9, NULL},
+ {ai_walk, 0, NULL}
};
mmove_t insane_move_walk_normal = {FRAME_walk27, FRAME_walk39, insane_frames_walk_normal, insane_walk};
mmove_t insane_move_run_normal = {FRAME_walk27, FRAME_walk39, insane_frames_walk_normal, insane_run};
mframe_t insane_frames_walk_insane [] =
{
- ai_walk, 0, insane_scream, // walk 1
- ai_walk, 3.4, NULL, // walk 2
- ai_walk, 3.6, NULL, // 3
- ai_walk, 2.9, NULL, // 4
- ai_walk, 2.2, NULL, // 5
- ai_walk, 2.6, NULL, // 6
- ai_walk, 0, NULL, // 7
- ai_walk, 0.7, NULL, // 8
- ai_walk, 4.8, NULL, // 9
- ai_walk, 5.3, NULL, // 10
- ai_walk, 1.1, NULL, // 11
- ai_walk, 2, NULL, // 12
- ai_walk, 0.5, NULL, // 13
- ai_walk, 0, NULL, // 14
- ai_walk, 0, NULL, // 15
- ai_walk, 4.9, NULL, // 16
- ai_walk, 6.7, NULL, // 17
- ai_walk, 3.8, NULL, // 18
- ai_walk, 2, NULL, // 19
- ai_walk, 0.2, NULL, // 20
- ai_walk, 0, NULL, // 21
- ai_walk, 3.4, NULL, // 22
- ai_walk, 6.4, NULL, // 23
- ai_walk, 5, NULL, // 24
- ai_walk, 1.8, NULL, // 25
- ai_walk, 0, NULL // 26
+ {ai_walk, 0, insane_scream}, // walk 1
+ {ai_walk, 3.4, NULL}, // walk 2
+ {ai_walk, 3.6, NULL}, // 3
+ {ai_walk, 2.9, NULL}, // 4
+ {ai_walk, 2.2, NULL}, // 5
+ {ai_walk, 2.6, NULL}, // 6
+ {ai_walk, 0, NULL}, // 7
+ {ai_walk, 0.7, NULL}, // 8
+ {ai_walk, 4.8, NULL}, // 9
+ {ai_walk, 5.3, NULL}, // 10
+ {ai_walk, 1.1, NULL}, // 11
+ {ai_walk, 2, NULL}, // 12
+ {ai_walk, 0.5, NULL}, // 13
+ {ai_walk, 0, NULL}, // 14
+ {ai_walk, 0, NULL}, // 15
+ {ai_walk, 4.9, NULL}, // 16
+ {ai_walk, 6.7, NULL}, // 17
+ {ai_walk, 3.8, NULL}, // 18
+ {ai_walk, 2, NULL}, // 19
+ {ai_walk, 0.2, NULL}, // 20
+ {ai_walk, 0, NULL}, // 21
+ {ai_walk, 3.4, NULL}, // 22
+ {ai_walk, 6.4, NULL}, // 23
+ {ai_walk, 5, NULL}, // 24
+ {ai_walk, 1.8, NULL}, // 25
+ {ai_walk, 0, NULL} // 26
};
mmove_t insane_move_walk_insane = {FRAME_walk1, FRAME_walk26, insane_frames_walk_insane, insane_walk};
mmove_t insane_move_run_insane = {FRAME_walk1, FRAME_walk26, insane_frames_walk_insane, insane_run};
mframe_t insane_frames_stand_pain [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t insane_move_stand_pain = {FRAME_st_pain2, FRAME_st_pain12, insane_frames_stand_pain, insane_run};
mframe_t insane_frames_stand_death [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t insane_move_stand_death = {FRAME_st_death2, FRAME_st_death18, insane_frames_stand_death, insane_dead};
mframe_t insane_frames_crawl [] =
{
- ai_walk, 0, insane_scream,
- ai_walk, 1.5, NULL,
- ai_walk, 2.1, NULL,
- ai_walk, 3.6, NULL,
- ai_walk, 2, NULL,
- ai_walk, 0.9, NULL,
- ai_walk, 3, NULL,
- ai_walk, 3.4, NULL,
- ai_walk, 2.4, NULL
+ {ai_walk, 0, insane_scream},
+ {ai_walk, 1.5, NULL},
+ {ai_walk, 2.1, NULL},
+ {ai_walk, 3.6, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 0.9, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, 3.4, NULL},
+ {ai_walk, 2.4, NULL}
};
mmove_t insane_move_crawl = {FRAME_crawl1, FRAME_crawl9, insane_frames_crawl, NULL};
mmove_t insane_move_runcrawl = {FRAME_crawl1, FRAME_crawl9, insane_frames_crawl, NULL};
mframe_t insane_frames_crawl_pain [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t insane_move_crawl_pain = {FRAME_cr_pain2, FRAME_cr_pain10, insane_frames_crawl_pain, insane_run};
mframe_t insane_frames_crawl_death [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t insane_move_crawl_death = {FRAME_cr_death10, FRAME_cr_death16, insane_frames_crawl_death, insane_dead};
mframe_t insane_frames_cross [] =
{
- ai_move, 0, insane_moan,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, insane_moan},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t insane_move_cross = {FRAME_cross1, FRAME_cross15, insane_frames_cross, insane_cross};
mframe_t insane_frames_struggle_cross [] =
{
- ai_move, 0, insane_scream,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, insane_scream},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t insane_move_struggle_cross = {FRAME_cross16, FRAME_cross30, insane_frames_struggle_cross, insane_cross};
Index: src/game/m_medic.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_medic.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_medic.c
--- src/game/m_medic.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_medic.c 2002/02/19 21:12:37
@@ -121,96 +121,96 @@
mframe_t medic_frames_stand [] =
{
- ai_stand, 0, medic_idle,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
+ {ai_stand, 0, medic_idle},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
};
mmove_t medic_move_stand = {FRAME_wait1, FRAME_wait90, medic_frames_stand, NULL};
@@ -223,18 +223,18 @@
mframe_t medic_frames_walk [] =
{
- ai_walk, 6.2, NULL,
- ai_walk, 18.1, NULL,
- ai_walk, 1, NULL,
- ai_walk, 9, NULL,
- ai_walk, 10, NULL,
- ai_walk, 9, NULL,
- ai_walk, 11, NULL,
- ai_walk, 11.6, NULL,
- ai_walk, 2, NULL,
- ai_walk, 9.9, NULL,
- ai_walk, 14, NULL,
- ai_walk, 9.3, NULL
+ {ai_walk, 6.2, NULL},
+ {ai_walk, 18.1, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 9, NULL},
+ {ai_walk, 10, NULL},
+ {ai_walk, 9, NULL},
+ {ai_walk, 11, NULL},
+ {ai_walk, 11.6, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 9.9, NULL},
+ {ai_walk, 14, NULL},
+ {ai_walk, 9.3, NULL}
};
mmove_t medic_move_walk = {FRAME_walk1, FRAME_walk12, medic_frames_walk, NULL};
@@ -246,12 +246,12 @@
mframe_t medic_frames_run [] =
{
- ai_run, 18, NULL,
- ai_run, 22.5, NULL,
- ai_run, 25.4, NULL,
- ai_run, 23.4, NULL,
- ai_run, 24, NULL,
- ai_run, 35.6, NULL
+ {ai_run, 18, NULL},
+ {ai_run, 22.5, NULL},
+ {ai_run, 25.4, NULL},
+ {ai_run, 23.4, NULL},
+ {ai_run, 24, NULL},
+ {ai_run, 35.6, NULL}
};
mmove_t medic_move_run = {FRAME_run1, FRAME_run6, medic_frames_run, NULL};
@@ -283,34 +283,34 @@
mframe_t medic_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t medic_move_pain1 = {FRAME_paina1, FRAME_paina8, medic_frames_pain1, medic_run};
mframe_t medic_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t medic_move_pain2 = {FRAME_painb1, FRAME_painb15, medic_frames_pain2, medic_run};
@@ -377,36 +377,36 @@
mframe_t medic_frames_death [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t medic_move_death = {FRAME_death1, FRAME_death30, medic_frames_death, medic_dead};
@@ -472,22 +472,22 @@
mframe_t medic_frames_duck [] =
{
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, medic_duck_down,
- ai_move, -1, medic_duck_hold,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, medic_duck_up,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, medic_duck_down},
+ {ai_move, -1, medic_duck_hold},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, medic_duck_up},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL}
};
mmove_t medic_move_duck = {FRAME_duck1, FRAME_duck16, medic_frames_duck, medic_run};
@@ -504,22 +504,22 @@
mframe_t medic_frames_attackHyperBlaster [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, medic_fire_blaster
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, medic_fire_blaster}
};
mmove_t medic_move_attackHyperBlaster = {FRAME_attack15, FRAME_attack30, medic_frames_attackHyperBlaster, medic_run};
@@ -534,20 +534,20 @@
mframe_t medic_frames_attackBlaster [] =
{
- ai_charge, 0, NULL,
- ai_charge, 5, NULL,
- ai_charge, 5, NULL,
- ai_charge, 3, NULL,
- ai_charge, 2, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, medic_fire_blaster,
- ai_charge, 0, NULL,
- ai_charge, 0, medic_continue // Change to medic_continue... Else, go to frame 32
+ {ai_charge, 0, NULL},
+ {ai_charge, 5, NULL},
+ {ai_charge, 5, NULL},
+ {ai_charge, 3, NULL},
+ {ai_charge, 2, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, medic_fire_blaster},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, medic_continue} // Change to medic_continue... Else, go to frame 32
};
mmove_t medic_move_attackBlaster = {FRAME_attack1, FRAME_attack14, medic_frames_attackBlaster, medic_run};
@@ -561,16 +561,16 @@
static vec3_t medic_cable_offsets[] =
{
- 45.0, -9.2, 15.5,
- 48.4, -9.7, 15.2,
- 47.8, -9.8, 15.8,
- 47.3, -9.3, 14.3,
- 45.4, -10.1, 13.1,
- 41.9, -12.7, 12.0,
- 37.8, -15.8, 11.2,
- 34.3, -18.4, 10.7,
- 32.7, -19.7, 10.4,
- 32.7, -19.7, 10.4
+ {45.0, -9.2, 15.5},
+ {48.4, -9.7, 15.2},
+ {47.8, -9.8, 15.8},
+ {47.3, -9.3, 14.3},
+ {45.4, -10.1, 13.1},
+ {41.9, -12.7, 12.0},
+ {37.8, -15.8, 11.2},
+ {34.3, -18.4, 10.7},
+ {32.7, -19.7, 10.4},
+ {32.7, -19.7, 10.4}
};
void medic_cable_attack (edict_t *self)
@@ -661,34 +661,34 @@
mframe_t medic_frames_attackCable [] =
{
- ai_move, 2, NULL,
- ai_move, 3, NULL,
- ai_move, 5, NULL,
- ai_move, 4.4, NULL,
- ai_charge, 4.7, NULL,
- ai_charge, 5, NULL,
- ai_charge, 6, NULL,
- ai_charge, 4, NULL,
- ai_charge, 0, NULL,
- ai_move, 0, medic_hook_launch,
- ai_move, 0, medic_cable_attack,
- ai_move, 0, medic_cable_attack,
- ai_move, 0, medic_cable_attack,
- ai_move, 0, medic_cable_attack,
- ai_move, 0, medic_cable_attack,
- ai_move, 0, medic_cable_attack,
- ai_move, 0, medic_cable_attack,
- ai_move, 0, medic_cable_attack,
- ai_move, 0, medic_cable_attack,
- ai_move, -15, medic_hook_retract,
- ai_move, -1.5, NULL,
- ai_move, -1.2, NULL,
- ai_move, -3, NULL,
- ai_move, -2, NULL,
- ai_move, 0.3, NULL,
- ai_move, 0.7, NULL,
- ai_move, 1.2, NULL,
- ai_move, 1.3, NULL
+ {ai_move, 2, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, 4.4, NULL},
+ {ai_charge, 4.7, NULL},
+ {ai_charge, 5, NULL},
+ {ai_charge, 6, NULL},
+ {ai_charge, 4, NULL},
+ {ai_charge, 0, NULL},
+ {ai_move, 0, medic_hook_launch},
+ {ai_move, 0, medic_cable_attack},
+ {ai_move, 0, medic_cable_attack},
+ {ai_move, 0, medic_cable_attack},
+ {ai_move, 0, medic_cable_attack},
+ {ai_move, 0, medic_cable_attack},
+ {ai_move, 0, medic_cable_attack},
+ {ai_move, 0, medic_cable_attack},
+ {ai_move, 0, medic_cable_attack},
+ {ai_move, 0, medic_cable_attack},
+ {ai_move, -15, medic_hook_retract},
+ {ai_move, -1.5, NULL},
+ {ai_move, -1.2, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 0.3, NULL},
+ {ai_move, 0.7, NULL},
+ {ai_move, 1.2, NULL},
+ {ai_move, 1.3, NULL}
};
mmove_t medic_move_attackCable = {FRAME_attack33, FRAME_attack60, medic_frames_attackCable, medic_run};
Index: src/game/m_mutant.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_mutant.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_mutant.c
--- src/game/m_mutant.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_mutant.c 2002/02/19 21:12:37
@@ -81,62 +81,62 @@
mframe_t mutant_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 10
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 20
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 30
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 40
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // 50
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 10
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 20
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 30
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 40
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // 50
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL}
};
mmove_t mutant_move_stand = {FRAME_stand101, FRAME_stand151, mutant_frames_stand, NULL};
@@ -158,19 +158,19 @@
mframe_t mutant_frames_idle [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL, // scratch loop start
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, mutant_idle_loop, // scratch loop end
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}, // scratch loop start
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, mutant_idle_loop}, // scratch loop end
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t mutant_move_idle = {FRAME_stand152, FRAME_stand164, mutant_frames_idle, mutant_stand};
@@ -189,18 +189,18 @@
mframe_t mutant_frames_walk [] =
{
- ai_walk, 3, NULL,
- ai_walk, 1, NULL,
- ai_walk, 5, NULL,
- ai_walk, 10, NULL,
- ai_walk, 13, NULL,
- ai_walk, 10, NULL,
- ai_walk, 0, NULL,
- ai_walk, 5, NULL,
- ai_walk, 6, NULL,
- ai_walk, 16, NULL,
- ai_walk, 15, NULL,
- ai_walk, 6, NULL
+ {ai_walk, 3, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 10, NULL},
+ {ai_walk, 13, NULL},
+ {ai_walk, 10, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 16, NULL},
+ {ai_walk, 15, NULL},
+ {ai_walk, 6, NULL}
};
mmove_t mutant_move_walk = {FRAME_walk05, FRAME_walk16, mutant_frames_walk, NULL};
@@ -211,10 +211,10 @@
mframe_t mutant_frames_start_walk [] =
{
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, -2, NULL,
- ai_walk, 1, NULL
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, -2, NULL},
+ {ai_walk, 1, NULL}
};
mmove_t mutant_move_start_walk = {FRAME_walk01, FRAME_walk04, mutant_frames_start_walk, mutant_walk_loop};
@@ -230,12 +230,12 @@
mframe_t mutant_frames_run [] =
{
- ai_run, 40, NULL,
- ai_run, 40, mutant_step,
- ai_run, 24, NULL,
- ai_run, 5, mutant_step,
- ai_run, 17, NULL,
- ai_run, 10, NULL
+ {ai_run, 40, NULL},
+ {ai_run, 40, mutant_step},
+ {ai_run, 24, NULL},
+ {ai_run, 5, mutant_step},
+ {ai_run, 17, NULL},
+ {ai_run, 10, NULL}
};
mmove_t mutant_move_run = {FRAME_run03, FRAME_run08, mutant_frames_run, NULL};
@@ -285,13 +285,13 @@
mframe_t mutant_frames_attack [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, mutant_hit_left,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, mutant_hit_right,
- ai_charge, 0, mutant_check_refire
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, mutant_hit_left},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, mutant_hit_right},
+ {ai_charge, 0, mutant_check_refire}
};
mmove_t mutant_move_attack = {FRAME_attack09, FRAME_attack15, mutant_frames_attack, mutant_run};
@@ -375,14 +375,14 @@
mframe_t mutant_frames_jump [] =
{
- ai_charge, 0, NULL,
- ai_charge, 17, NULL,
- ai_charge, 15, mutant_jump_takeoff,
- ai_charge, 15, NULL,
- ai_charge, 15, mutant_check_landing,
- ai_charge, 0, NULL,
- ai_charge, 3, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 17, NULL},
+ {ai_charge, 15, mutant_jump_takeoff},
+ {ai_charge, 15, NULL},
+ {ai_charge, 15, mutant_check_landing},
+ {ai_charge, 0, NULL},
+ {ai_charge, 3, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t mutant_move_jump = {FRAME_attack01, FRAME_attack08, mutant_frames_jump, mutant_run};
@@ -458,38 +458,38 @@
mframe_t mutant_frames_pain1 [] =
{
- ai_move, 4, NULL,
- ai_move, -3, NULL,
- ai_move, -8, NULL,
- ai_move, 2, NULL,
- ai_move, 5, NULL
+ {ai_move, 4, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, -8, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 5, NULL}
};
mmove_t mutant_move_pain1 = {FRAME_pain101, FRAME_pain105, mutant_frames_pain1, mutant_run};
mframe_t mutant_frames_pain2 [] =
{
- ai_move, -24,NULL,
- ai_move, 11, NULL,
- ai_move, 5, NULL,
- ai_move, -2, NULL,
- ai_move, 6, NULL,
- ai_move, 4, NULL
+ {ai_move, -24,NULL},
+ {ai_move, 11, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 6, NULL},
+ {ai_move, 4, NULL}
};
mmove_t mutant_move_pain2 = {FRAME_pain201, FRAME_pain206, mutant_frames_pain2, mutant_run};
mframe_t mutant_frames_pain3 [] =
{
- ai_move, -22,NULL,
- ai_move, 3, NULL,
- ai_move, 3, NULL,
- ai_move, 2, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, 6, NULL,
- ai_move, 3, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, 1, NULL
+ {ai_move, -22,NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 6, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 1, NULL}
};
mmove_t mutant_move_pain3 = {FRAME_pain301, FRAME_pain311, mutant_frames_pain3, mutant_run};
@@ -544,30 +544,30 @@
mframe_t mutant_frames_death1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t mutant_move_death1 = {FRAME_death101, FRAME_death109, mutant_frames_death1, mutant_dead};
mframe_t mutant_frames_death2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t mutant_move_death2 = {FRAME_death201, FRAME_death210, mutant_frames_death2, mutant_dead};
Index: src/game/m_parasite.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_parasite.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_parasite.c
--- src/game/m_parasite.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_parasite.c 2002/02/19 21:12:37
@@ -85,34 +85,34 @@
mframe_t parasite_frames_start_fidget [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t parasite_move_start_fidget = {FRAME_stand18, FRAME_stand21, parasite_frames_start_fidget, parasite_do_fidget};
mframe_t parasite_frames_fidget [] =
{
- ai_stand, 0, parasite_scratch,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, parasite_scratch,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, parasite_scratch},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, parasite_scratch},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t parasite_move_fidget = {FRAME_stand22, FRAME_stand27, parasite_frames_fidget, parasite_refidget};
mframe_t parasite_frames_end_fidget [] =
{
- ai_stand, 0, parasite_scratch,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, parasite_scratch},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t parasite_move_end_fidget = {FRAME_stand28, FRAME_stand35, parasite_frames_end_fidget, parasite_stand};
@@ -142,23 +142,23 @@
mframe_t parasite_frames_stand [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, parasite_tap,
- ai_stand, 0, NULL,
- ai_stand, 0, parasite_tap,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, parasite_tap,
- ai_stand, 0, NULL,
- ai_stand, 0, parasite_tap,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, parasite_tap,
- ai_stand, 0, NULL,
- ai_stand, 0, parasite_tap
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, parasite_tap},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, parasite_tap},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, parasite_tap},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, parasite_tap},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, parasite_tap},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, parasite_tap}
};
mmove_t parasite_move_stand = {FRAME_stand01, FRAME_stand17, parasite_frames_stand, parasite_stand};
@@ -170,31 +170,31 @@
mframe_t parasite_frames_run [] =
{
- ai_run, 30, NULL,
- ai_run, 30, NULL,
- ai_run, 22, NULL,
- ai_run, 19, NULL,
- ai_run, 24, NULL,
- ai_run, 28, NULL,
- ai_run, 25, NULL
+ {ai_run, 30, NULL},
+ {ai_run, 30, NULL},
+ {ai_run, 22, NULL},
+ {ai_run, 19, NULL},
+ {ai_run, 24, NULL},
+ {ai_run, 28, NULL},
+ {ai_run, 25, NULL}
};
mmove_t parasite_move_run = {FRAME_run03, FRAME_run09, parasite_frames_run, NULL};
mframe_t parasite_frames_start_run [] =
{
- ai_run, 0, NULL,
- ai_run, 30, NULL,
+ {ai_run, 0, NULL},
+ {ai_run, 30, NULL},
};
mmove_t parasite_move_start_run = {FRAME_run01, FRAME_run02, parasite_frames_start_run, parasite_run};
mframe_t parasite_frames_stop_run [] =
{
- ai_run, 20, NULL,
- ai_run, 20, NULL,
- ai_run, 12, NULL,
- ai_run, 10, NULL,
- ai_run, 0, NULL,
- ai_run, 0, NULL
+ {ai_run, 20, NULL},
+ {ai_run, 20, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 0, NULL},
+ {ai_run, 0, NULL}
};
mmove_t parasite_move_stop_run = {FRAME_run10, FRAME_run15, parasite_frames_stop_run, NULL};
@@ -217,31 +217,31 @@
mframe_t parasite_frames_walk [] =
{
- ai_walk, 30, NULL,
- ai_walk, 30, NULL,
- ai_walk, 22, NULL,
- ai_walk, 19, NULL,
- ai_walk, 24, NULL,
- ai_walk, 28, NULL,
- ai_walk, 25, NULL
+ {ai_walk, 30, NULL},
+ {ai_walk, 30, NULL},
+ {ai_walk, 22, NULL},
+ {ai_walk, 19, NULL},
+ {ai_walk, 24, NULL},
+ {ai_walk, 28, NULL},
+ {ai_walk, 25, NULL}
};
mmove_t parasite_move_walk = {FRAME_run03, FRAME_run09, parasite_frames_walk, parasite_walk};
mframe_t parasite_frames_start_walk [] =
{
- ai_walk, 0, NULL,
- ai_walk, 30, parasite_walk
+ {ai_walk, 0, NULL},
+ {ai_walk, 30, parasite_walk}
};
mmove_t parasite_move_start_walk = {FRAME_run01, FRAME_run02, parasite_frames_start_walk, NULL};
mframe_t parasite_frames_stop_walk [] =
{
- ai_walk, 20, NULL,
- ai_walk, 20, NULL,
- ai_walk, 12, NULL,
- ai_walk, 10, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL
+ {ai_walk, 20, NULL},
+ {ai_walk, 20, NULL},
+ {ai_walk, 12, NULL},
+ {ai_walk, 10, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL}
};
mmove_t parasite_move_stop_walk = {FRAME_run10, FRAME_run15, parasite_frames_stop_walk, NULL};
@@ -258,17 +258,17 @@
mframe_t parasite_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 6, NULL,
- ai_move, 16, NULL,
- ai_move, -6, NULL,
- ai_move, -7, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 6, NULL},
+ {ai_move, 16, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, -7, NULL},
+ {ai_move, 0, NULL}
};
mmove_t parasite_move_pain1 = {FRAME_pain101, FRAME_pain111, parasite_frames_pain1, parasite_start_run};
@@ -365,62 +365,62 @@
mframe_t parasite_frames_drain [] =
{
- ai_charge, 0, parasite_launch,
- ai_charge, 0, NULL,
- ai_charge, 15, parasite_drain_attack, // Target hits
- ai_charge, 0, parasite_drain_attack, // drain
- ai_charge, 0, parasite_drain_attack, // drain
- ai_charge, 0, parasite_drain_attack, // drain
- ai_charge, 0, parasite_drain_attack, // drain
- ai_charge, -2, parasite_drain_attack, // drain
- ai_charge, -2, parasite_drain_attack, // drain
- ai_charge, -3, parasite_drain_attack, // drain
- ai_charge, -2, parasite_drain_attack, // drain
- ai_charge, 0, parasite_drain_attack, // drain
- ai_charge, -1, parasite_drain_attack, // drain
- ai_charge, 0, parasite_reel_in, // let go
- ai_charge, -2, NULL,
- ai_charge, -2, NULL,
- ai_charge, -3, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, parasite_launch},
+ {ai_charge, 0, NULL},
+ {ai_charge, 15, parasite_drain_attack}, // Target hits
+ {ai_charge, 0, parasite_drain_attack}, // drain
+ {ai_charge, 0, parasite_drain_attack}, // drain
+ {ai_charge, 0, parasite_drain_attack}, // drain
+ {ai_charge, 0, parasite_drain_attack}, // drain
+ {ai_charge, -2, parasite_drain_attack}, // drain
+ {ai_charge, -2, parasite_drain_attack}, // drain
+ {ai_charge, -3, parasite_drain_attack}, // drain
+ {ai_charge, -2, parasite_drain_attack}, // drain
+ {ai_charge, 0, parasite_drain_attack}, // drain
+ {ai_charge, -1, parasite_drain_attack}, // drain
+ {ai_charge, 0, parasite_reel_in}, // let go
+ {ai_charge, -2, NULL},
+ {ai_charge, -2, NULL},
+ {ai_charge, -3, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t parasite_move_drain = {FRAME_drain01, FRAME_drain18, parasite_frames_drain, parasite_start_run};
mframe_t parasite_frames_break [] =
{
- ai_charge, 0, NULL,
- ai_charge, -3, NULL,
- ai_charge, 1, NULL,
- ai_charge, 2, NULL,
- ai_charge, -3, NULL,
- ai_charge, 1, NULL,
- ai_charge, 1, NULL,
- ai_charge, 3, NULL,
- ai_charge, 0, NULL,
- ai_charge, -18, NULL,
- ai_charge, 3, NULL,
- ai_charge, 9, NULL,
- ai_charge, 6, NULL,
- ai_charge, 0, NULL,
- ai_charge, -18, NULL,
- ai_charge, 0, NULL,
- ai_charge, 8, NULL,
- ai_charge, 9, NULL,
- ai_charge, 0, NULL,
- ai_charge, -18, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL, // airborne
- ai_charge, 0, NULL, // airborne
- ai_charge, 0, NULL, // slides
- ai_charge, 0, NULL, // slides
- ai_charge, 0, NULL, // slides
- ai_charge, 0, NULL, // slides
- ai_charge, 4, NULL,
- ai_charge, 11, NULL,
- ai_charge, -2, NULL,
- ai_charge, -5, NULL,
- ai_charge, 1, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, -3, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 2, NULL},
+ {ai_charge, -3, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 3, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -18, NULL},
+ {ai_charge, 3, NULL},
+ {ai_charge, 9, NULL},
+ {ai_charge, 6, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -18, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 8, NULL},
+ {ai_charge, 9, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -18, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}, // airborne
+ {ai_charge, 0, NULL}, // airborne
+ {ai_charge, 0, NULL}, // slides
+ {ai_charge, 0, NULL}, // slides
+ {ai_charge, 0, NULL}, // slides
+ {ai_charge, 0, NULL}, // slides
+ {ai_charge, 4, NULL},
+ {ai_charge, 11, NULL},
+ {ai_charge, -2, NULL},
+ {ai_charge, -5, NULL},
+ {ai_charge, 1, NULL}
};
mmove_t parasite_move_break = {FRAME_break01, FRAME_break32, parasite_frames_break, parasite_start_run};
@@ -458,13 +458,13 @@
mframe_t parasite_frames_death [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t parasite_move_death = {FRAME_death101, FRAME_death107, parasite_frames_death, parasite_dead};
Index: src/game/m_soldier.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_soldier.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m_soldier.c
--- src/game/m_soldier.c 2001/12/28 08:04:24 1.1.1.1
+++ src/game/m_soldier.c 2002/02/19 21:12:37
@@ -62,148 +62,148 @@
mframe_t soldier_frames_stand1 [] =
{
- ai_stand, 0, soldier_idle,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, soldier_idle},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t soldier_move_stand1 = {FRAME_stand101, FRAME_stand130, soldier_frames_stand1, soldier_stand};
mframe_t soldier_frames_stand3 [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, soldier_cock,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, soldier_cock},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t soldier_move_stand3 = {FRAME_stand301, FRAME_stand339, soldier_frames_stand3, soldier_stand};
#if 0
mframe_t soldier_frames_stand4 [] =
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
-
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 4, NULL,
- ai_stand, 1, NULL,
- ai_stand, -1, NULL,
- ai_stand, -2, NULL,
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 4, NULL},
+ {ai_stand, 1, NULL},
+ {ai_stand, -1, NULL},
+ {ai_stand, -2, NULL},
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t soldier_move_stand4 = {FRAME_stand401, FRAME_stand452, soldier_frames_stand4, NULL};
#endif
@@ -229,54 +229,54 @@
mframe_t soldier_frames_walk1 [] =
{
- ai_walk, 3, NULL,
- ai_walk, 6, NULL,
- ai_walk, 2, NULL,
- ai_walk, 2, NULL,
- ai_walk, 2, NULL,
- ai_walk, 1, NULL,
- ai_walk, 6, NULL,
- ai_walk, 5, NULL,
- ai_walk, 3, NULL,
- ai_walk, -1, soldier_walk1_random,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL
+ {ai_walk, 3, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, -1, soldier_walk1_random},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL}
};
mmove_t soldier_move_walk1 = {FRAME_walk101, FRAME_walk133, soldier_frames_walk1, NULL};
mframe_t soldier_frames_walk2 [] =
{
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 9, NULL,
- ai_walk, 8, NULL,
- ai_walk, 5, NULL,
- ai_walk, 1, NULL,
- ai_walk, 3, NULL,
- ai_walk, 7, NULL,
- ai_walk, 6, NULL,
- ai_walk, 7, NULL
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 9, NULL},
+ {ai_walk, 8, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 1, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 7, NULL}
};
mmove_t soldier_move_walk2 = {FRAME_walk209, FRAME_walk218, soldier_frames_walk2, NULL};
@@ -297,19 +297,19 @@
mframe_t soldier_frames_start_run [] =
{
- ai_run, 7, NULL,
- ai_run, 5, NULL
+ {ai_run, 7, NULL},
+ {ai_run, 5, NULL}
};
mmove_t soldier_move_start_run = {FRAME_run01, FRAME_run02, soldier_frames_start_run, soldier_run};
mframe_t soldier_frames_run [] =
{
- ai_run, 10, NULL,
- ai_run, 11, NULL,
- ai_run, 11, NULL,
- ai_run, 16, NULL,
- ai_run, 10, NULL,
- ai_run, 15, NULL
+ {ai_run, 10, NULL},
+ {ai_run, 11, NULL},
+ {ai_run, 11, NULL},
+ {ai_run, 16, NULL},
+ {ai_run, 10, NULL},
+ {ai_run, 15, NULL}
};
mmove_t soldier_move_run = {FRAME_run03, FRAME_run08, soldier_frames_run, NULL};
@@ -340,68 +340,68 @@
mframe_t soldier_frames_pain1 [] =
{
- ai_move, -3, NULL,
- ai_move, 4, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL
+ {ai_move, -3, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL}
};
mmove_t soldier_move_pain1 = {FRAME_pain101, FRAME_pain105, soldier_frames_pain1, soldier_run};
mframe_t soldier_frames_pain2 [] =
{
- ai_move, -13, NULL,
- ai_move, -1, NULL,
- ai_move, 2, NULL,
- ai_move, 4, NULL,
- ai_move, 2, NULL,
- ai_move, 3, NULL,
- ai_move, 2, NULL
+ {ai_move, -13, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 2, NULL}
};
mmove_t soldier_move_pain2 = {FRAME_pain201, FRAME_pain207, soldier_frames_pain2, soldier_run};
mframe_t soldier_frames_pain3 [] =
{
- ai_move, -8, NULL,
- ai_move, 10, NULL,
- ai_move, -4, NULL,
- ai_move, -1, NULL,
- ai_move, -3, NULL,
- ai_move, 0, NULL,
- ai_move, 3, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, 1, NULL,
- ai_move, 2, NULL,
- ai_move, 4, NULL,
- ai_move, 3, NULL,
- ai_move, 2, NULL
+ {ai_move, -8, NULL},
+ {ai_move, 10, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 2, NULL}
};
mmove_t soldier_move_pain3 = {FRAME_pain301, FRAME_pain318, soldier_frames_pain3, soldier_run};
mframe_t soldier_frames_pain4 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -10, NULL,
- ai_move, -6, NULL,
- ai_move, 8, NULL,
- ai_move, 4, NULL,
- ai_move, 1, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 5, NULL,
- ai_move, 2, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, 3, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -10, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, 8, NULL},
+ {ai_move, 4, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 5, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL}
};
mmove_t soldier_move_pain4 = {FRAME_pain401, FRAME_pain417, soldier_frames_pain4, soldier_run};
@@ -558,18 +558,18 @@
mframe_t soldier_frames_attack1 [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_fire1,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_attack1_refire1,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_cock,
- ai_charge, 0, soldier_attack1_refire2,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_fire1},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_attack1_refire1},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_cock},
+ {ai_charge, 0, soldier_attack1_refire2},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t soldier_move_attack1 = {FRAME_attak101, FRAME_attak112, soldier_frames_attack1, soldier_run};
@@ -608,24 +608,24 @@
mframe_t soldier_frames_attack2 [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_fire2,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_attack2_refire1,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_cock,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_attack2_refire2,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_fire2},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_attack2_refire1},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_cock},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_attack2_refire2},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t soldier_move_attack2 = {FRAME_attak201, FRAME_attak218, soldier_frames_attack2, soldier_run};
@@ -664,15 +664,15 @@
mframe_t soldier_frames_attack3 [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_fire3,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_attack3_refire,
- ai_charge, 0, soldier_duck_up,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_fire3},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_attack3_refire},
+ {ai_charge, 0, soldier_duck_up},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t soldier_move_attack3 = {FRAME_attak301, FRAME_attak309, soldier_frames_attack3, soldier_run};
@@ -691,12 +691,12 @@
mframe_t soldier_frames_attack4 [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_fire4,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_fire4},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t soldier_move_attack4 = {FRAME_attak401, FRAME_attak406, soldier_frames_attack4, soldier_run};
@@ -719,14 +719,14 @@
mframe_t soldier_frames_attack5 [] =
{
- ai_charge, 8, NULL,
- ai_charge, 8, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_fire5,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, soldier_attack5_refire
+ {ai_charge, 8, NULL},
+ {ai_charge, 8, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_fire5},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, soldier_attack5_refire}
};
mmove_t soldier_move_attack5 = {FRAME_attak501, FRAME_attak508, soldier_frames_attack5, soldier_run};
#endif
@@ -752,20 +752,20 @@
mframe_t soldier_frames_attack6 [] =
{
- ai_charge, 10, NULL,
- ai_charge, 4, NULL,
- ai_charge, 12, NULL,
- ai_charge, 11, soldier_fire8,
- ai_charge, 13, NULL,
- ai_charge, 18, NULL,
- ai_charge, 15, NULL,
- ai_charge, 14, NULL,
- ai_charge, 11, NULL,
- ai_charge, 8, NULL,
- ai_charge, 11, NULL,
- ai_charge, 12, NULL,
- ai_charge, 12, NULL,
- ai_charge, 17, soldier_attack6_refire
+ {ai_charge, 10, NULL},
+ {ai_charge, 4, NULL},
+ {ai_charge, 12, NULL},
+ {ai_charge, 11, soldier_fire8},
+ {ai_charge, 13, NULL},
+ {ai_charge, 18, NULL},
+ {ai_charge, 15, NULL},
+ {ai_charge, 14, NULL},
+ {ai_charge, 11, NULL},
+ {ai_charge, 8, NULL},
+ {ai_charge, 11, NULL},
+ {ai_charge, 12, NULL},
+ {ai_charge, 12, NULL},
+ {ai_charge, 17, soldier_attack6_refire}
};
mmove_t soldier_move_attack6 = {FRAME_runs01, FRAME_runs14, soldier_frames_attack6, soldier_run};
@@ -817,11 +817,11 @@
mframe_t soldier_frames_duck [] =
{
- ai_move, 5, soldier_duck_down,
- ai_move, -1, soldier_duck_hold,
- ai_move, 1, NULL,
- ai_move, 0, soldier_duck_up,
- ai_move, 5, NULL
+ {ai_move, 5, soldier_duck_down},
+ {ai_move, -1, soldier_duck_hold},
+ {ai_move, 1, NULL},
+ {ai_move, 0, soldier_duck_up},
+ {ai_move, 5, NULL}
};
mmove_t soldier_move_duck = {FRAME_duck01, FRAME_duck05, soldier_frames_duck, soldier_run};
@@ -893,251 +893,251 @@
mframe_t soldier_frames_death1 [] =
{
- ai_move, 0, NULL,
- ai_move, -10, NULL,
- ai_move, -10, NULL,
- ai_move, -10, NULL,
- ai_move, -5, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, soldier_fire6,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, soldier_fire7,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, -10, NULL},
+ {ai_move, -10, NULL},
+ {ai_move, -10, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, soldier_fire6},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, soldier_fire7},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t soldier_move_death1 = {FRAME_death101, FRAME_death136, soldier_frames_death1, soldier_dead};
mframe_t soldier_frames_death2 [] =
{
- ai_move, -5, NULL,
- ai_move, -5, NULL,
- ai_move, -5, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, -5, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t soldier_move_death2 = {FRAME_death201, FRAME_death235, soldier_frames_death2, soldier_dead};
mframe_t soldier_frames_death3 [] =
{
- ai_move, -5, NULL,
- ai_move, -5, NULL,
- ai_move, -5, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
+ {ai_move, -5, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
};
mmove_t soldier_move_death3 = {FRAME_death301, FRAME_death345, soldier_frames_death3, soldier_dead};
mframe_t soldier_frames_death4 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t soldier_move_death4 = {FRAME_death401, FRAME_death453, soldier_frames_death4, soldier_dead};
mframe_t soldier_frames_death5 [] =
{
- ai_move, -5, NULL,
- ai_move, -5, NULL,
- ai_move, -5, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
-
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, -5, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t soldier_move_death5 = {FRAME_death501, FRAME_death524, soldier_frames_death5, soldier_dead};
mframe_t soldier_frames_death6 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t soldier_move_death6 = {FRAME_death601, FRAME_death610, soldier_frames_death6, soldier_dead};
Index: src/game/m_supertank.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_supertank.c,v
retrieving revision 1.2
diff -u -r1.2 m_supertank.c
--- src/game/m_supertank.c 2002/01/03 05:10:14 1.2
+++ src/game/m_supertank.c 2002/02/19 21:12:37
@@ -67,66 +67,66 @@
mframe_t supertank_frames_stand []=
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t supertank_move_stand = {FRAME_stand_1, FRAME_stand_60, supertank_frames_stand, NULL};
@@ -138,24 +138,24 @@
mframe_t supertank_frames_run [] =
{
- ai_run, 12, TreadSound,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL,
- ai_run, 12, NULL
+ {ai_run, 12, TreadSound},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL},
+ {ai_run, 12, NULL}
};
mmove_t supertank_move_run = {FRAME_forwrd_1, FRAME_forwrd_18, supertank_frames_run, NULL};
@@ -166,24 +166,24 @@
mframe_t supertank_frames_forward [] =
{
- ai_walk, 4, TreadSound,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, NULL
+ {ai_walk, 4, TreadSound},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, NULL}
};
mmove_t supertank_move_forward = {FRAME_forwrd_1, FRAME_forwrd_18, supertank_frames_forward, NULL};
@@ -207,233 +207,233 @@
mframe_t supertank_frames_turn_right [] =
{
- ai_move, 0, TreadSound,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, TreadSound},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t supertank_move_turn_right = {FRAME_right_1, FRAME_right_18, supertank_frames_turn_right, supertank_run};
mframe_t supertank_frames_turn_left [] =
{
- ai_move, 0, TreadSound,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, TreadSound},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t supertank_move_turn_left = {FRAME_left_1, FRAME_left_18, supertank_frames_turn_left, supertank_run};
mframe_t supertank_frames_pain3 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t supertank_move_pain3 = {FRAME_pain3_9, FRAME_pain3_12, supertank_frames_pain3, supertank_run};
mframe_t supertank_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t supertank_move_pain2 = {FRAME_pain2_5, FRAME_pain2_8, supertank_frames_pain2, supertank_run};
mframe_t supertank_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t supertank_move_pain1 = {FRAME_pain1_1, FRAME_pain1_4, supertank_frames_pain1, supertank_run};
mframe_t supertank_frames_death1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, BossExplode
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, BossExplode}
};
mmove_t supertank_move_death = {FRAME_death_1, FRAME_death_24, supertank_frames_death1, supertank_dead};
mframe_t supertank_frames_backward[] =
{
- ai_walk, 0, TreadSound,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL,
- ai_walk, 0, NULL
+ {ai_walk, 0, TreadSound},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL},
+ {ai_walk, 0, NULL}
};
mmove_t supertank_move_backward = {FRAME_backwd_1, FRAME_backwd_18, supertank_frames_backward, NULL};
mframe_t supertank_frames_attack4[]=
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t supertank_move_attack4 = {FRAME_attak4_1, FRAME_attak4_6, supertank_frames_attack4, supertank_run};
mframe_t supertank_frames_attack3[]=
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t supertank_move_attack3 = {FRAME_attak3_1, FRAME_attak3_27, supertank_frames_attack3, supertank_run};
mframe_t supertank_frames_attack2[]=
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, supertankRocket,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, supertankRocket,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, supertankRocket,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, supertankRocket},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, supertankRocket},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, supertankRocket},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t supertank_move_attack2 = {FRAME_attak2_1, FRAME_attak2_27, supertank_frames_attack2, supertank_run};
mframe_t supertank_frames_attack1[]=
{
- ai_charge, 0, supertankMachineGun,
- ai_charge, 0, supertankMachineGun,
- ai_charge, 0, supertankMachineGun,
- ai_charge, 0, supertankMachineGun,
- ai_charge, 0, supertankMachineGun,
- ai_charge, 0, supertankMachineGun,
+ {ai_charge, 0, supertankMachineGun},
+ {ai_charge, 0, supertankMachineGun},
+ {ai_charge, 0, supertankMachineGun},
+ {ai_charge, 0, supertankMachineGun},
+ {ai_charge, 0, supertankMachineGun},
+ {ai_charge, 0, supertankMachineGun},
};
mmove_t supertank_move_attack1 = {FRAME_attak1_1, FRAME_attak1_6, supertank_frames_attack1, supertank_reattack1};
mframe_t supertank_frames_end_attack1[]=
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t supertank_move_end_attack1 = {FRAME_attak1_7, FRAME_attak1_20, supertank_frames_end_attack1, supertank_run};
Index: src/game/m_tank.c
===================================================================
RCS file: /cvs/cvsroot/quake2/src/game/m_tank.c,v
retrieving revision 1.2
diff -u -r1.2 m_tank.c
--- src/game/m_tank.c 2002/01/03 05:10:14 1.2
+++ src/game/m_tank.c 2002/02/19 21:12:38
@@ -79,36 +79,36 @@
mframe_t tank_frames_stand []=
{
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL,
- ai_stand, 0, NULL
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL},
+ {ai_stand, 0, NULL}
};
mmove_t tank_move_stand = {FRAME_stand01, FRAME_stand30, tank_frames_stand, NULL};
@@ -126,41 +126,41 @@
mframe_t tank_frames_start_walk [] =
{
- ai_walk, 0, NULL,
- ai_walk, 6, NULL,
- ai_walk, 6, NULL,
- ai_walk, 11, tank_footstep
+ {ai_walk, 0, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 11, tank_footstep}
};
mmove_t tank_move_start_walk = {FRAME_walk01, FRAME_walk04, tank_frames_start_walk, tank_walk};
mframe_t tank_frames_walk [] =
{
- ai_walk, 4, NULL,
- ai_walk, 5, NULL,
- ai_walk, 3, NULL,
- ai_walk, 2, NULL,
- ai_walk, 5, NULL,
- ai_walk, 5, NULL,
- ai_walk, 4, NULL,
- ai_walk, 4, tank_footstep,
- ai_walk, 3, NULL,
- ai_walk, 5, NULL,
- ai_walk, 4, NULL,
- ai_walk, 5, NULL,
- ai_walk, 7, NULL,
- ai_walk, 7, NULL,
- ai_walk, 6, NULL,
- ai_walk, 6, tank_footstep
+ {ai_walk, 4, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 4, tank_footstep},
+ {ai_walk, 3, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 4, NULL},
+ {ai_walk, 5, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 7, NULL},
+ {ai_walk, 6, NULL},
+ {ai_walk, 6, tank_footstep}
};
mmove_t tank_move_walk = {FRAME_walk05, FRAME_walk20, tank_frames_walk, NULL};
mframe_t tank_frames_stop_walk [] =
{
- ai_walk, 3, NULL,
- ai_walk, 3, NULL,
- ai_walk, 2, NULL,
- ai_walk, 2, NULL,
- ai_walk, 4, tank_footstep
+ {ai_walk, 3, NULL},
+ {ai_walk, 3, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 2, NULL},
+ {ai_walk, 4, tank_footstep}
};
mmove_t tank_move_stop_walk = {FRAME_walk21, FRAME_walk25, tank_frames_stop_walk, tank_stand};
@@ -178,41 +178,41 @@
mframe_t tank_frames_start_run [] =
{
- ai_run, 0, NULL,
- ai_run, 6, NULL,
- ai_run, 6, NULL,
- ai_run, 11, tank_footstep
+ {ai_run, 0, NULL},
+ {ai_run, 6, NULL},
+ {ai_run, 6, NULL},
+ {ai_run, 11, tank_footstep}
};
mmove_t tank_move_start_run = {FRAME_walk01, FRAME_walk04, tank_frames_start_run, tank_run};
mframe_t tank_frames_run [] =
{
- ai_run, 4, NULL,
- ai_run, 5, NULL,
- ai_run, 3, NULL,
- ai_run, 2, NULL,
- ai_run, 5, NULL,
- ai_run, 5, NULL,
- ai_run, 4, NULL,
- ai_run, 4, tank_footstep,
- ai_run, 3, NULL,
- ai_run, 5, NULL,
- ai_run, 4, NULL,
- ai_run, 5, NULL,
- ai_run, 7, NULL,
- ai_run, 7, NULL,
- ai_run, 6, NULL,
- ai_run, 6, tank_footstep
+ {ai_run, 4, NULL},
+ {ai_run, 5, NULL},
+ {ai_run, 3, NULL},
+ {ai_run, 2, NULL},
+ {ai_run, 5, NULL},
+ {ai_run, 5, NULL},
+ {ai_run, 4, NULL},
+ {ai_run, 4, tank_footstep},
+ {ai_run, 3, NULL},
+ {ai_run, 5, NULL},
+ {ai_run, 4, NULL},
+ {ai_run, 5, NULL},
+ {ai_run, 7, NULL},
+ {ai_run, 7, NULL},
+ {ai_run, 6, NULL},
+ {ai_run, 6, tank_footstep}
};
mmove_t tank_move_run = {FRAME_walk05, FRAME_walk20, tank_frames_run, NULL};
mframe_t tank_frames_stop_run [] =
{
- ai_run, 3, NULL,
- ai_run, 3, NULL,
- ai_run, 2, NULL,
- ai_run, 2, NULL,
- ai_run, 4, tank_footstep
+ {ai_run, 3, NULL},
+ {ai_run, 3, NULL},
+ {ai_run, 2, NULL},
+ {ai_run, 2, NULL},
+ {ai_run, 4, tank_footstep}
};
mmove_t tank_move_stop_run = {FRAME_walk21, FRAME_walk25, tank_frames_stop_run, tank_walk};
@@ -246,41 +246,41 @@
mframe_t tank_frames_pain1 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t tank_move_pain1 = {FRAME_pain101, FRAME_pain104, tank_frames_pain1, tank_run};
mframe_t tank_frames_pain2 [] =
{
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t tank_move_pain2 = {FRAME_pain201, FRAME_pain205, tank_frames_pain2, tank_run};
mframe_t tank_frames_pain3 [] =
{
- ai_move, -7, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 3, NULL,
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, tank_footstep
+ {ai_move, -7, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, tank_footstep}
};
mmove_t tank_move_pain3 = {FRAME_pain301, FRAME_pain316, tank_frames_pain3, tank_run};
@@ -423,44 +423,44 @@
mframe_t tank_frames_attack_blast [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, -1, NULL,
- ai_charge, -2, NULL,
- ai_charge, -1, NULL,
- ai_charge, -1, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, TankBlaster, // 10
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, TankBlaster,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, TankBlaster // 16
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, -2, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, TankBlaster}, // 10
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, TankBlaster},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, TankBlaster} // 16
};
mmove_t tank_move_attack_blast = {FRAME_attak101, FRAME_attak116, tank_frames_attack_blast, tank_reattack_blaster};
mframe_t tank_frames_reattack_blast [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, TankBlaster,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, TankBlaster // 16
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, TankBlaster},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, TankBlaster} // 16
};
mmove_t tank_move_reattack_blast = {FRAME_attak111, FRAME_attak116, tank_frames_reattack_blast, tank_reattack_blaster};
mframe_t tank_frames_attack_post_blast [] =
{
- ai_move, 0, NULL, // 17
- ai_move, 0, NULL,
- ai_move, 2, NULL,
- ai_move, 3, NULL,
- ai_move, 2, NULL,
- ai_move, -2, tank_footstep // 22
+ {ai_move, 0, NULL}, // 17
+ {ai_move, 0, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, -2, tank_footstep} // 22
};
mmove_t tank_move_attack_post_blast = {FRAME_attak117, FRAME_attak122, tank_frames_attack_post_blast, tank_run};
@@ -486,150 +486,150 @@
mframe_t tank_frames_attack_strike [] =
{
- ai_move, 3, NULL,
- ai_move, 2, NULL,
- ai_move, 2, NULL,
- ai_move, 1, NULL,
- ai_move, 6, NULL,
- ai_move, 7, NULL,
- ai_move, 9, tank_footstep,
- ai_move, 2, NULL,
- ai_move, 1, NULL,
- ai_move, 2, NULL,
- ai_move, 2, tank_footstep,
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -2, NULL,
- ai_move, -2, NULL,
- ai_move, 0, tank_windup,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, TankStrike,
- ai_move, 0, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -1, NULL,
- ai_move, -3, NULL,
- ai_move, -10, NULL,
- ai_move, -10, NULL,
- ai_move, -2, NULL,
- ai_move, -3, NULL,
- ai_move, -2, tank_footstep
+ {ai_move, 3, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 6, NULL},
+ {ai_move, 7, NULL},
+ {ai_move, 9, tank_footstep},
+ {ai_move, 2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 2, tank_footstep},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 0, tank_windup},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, TankStrike},
+ {ai_move, 0, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -1, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, -10, NULL},
+ {ai_move, -10, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, -2, tank_footstep}
};
mmove_t tank_move_attack_strike = {FRAME_attak201, FRAME_attak238, tank_frames_attack_strike, tank_poststrike};
mframe_t tank_frames_attack_pre_rocket [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL, // 10
-
- ai_charge, 0, NULL,
- ai_charge, 1, NULL,
- ai_charge, 2, NULL,
- ai_charge, 7, NULL,
- ai_charge, 7, NULL,
- ai_charge, 7, tank_footstep,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL, // 20
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}, // 10
+
+ {ai_charge, 0, NULL},
+ {ai_charge, 1, NULL},
+ {ai_charge, 2, NULL},
+ {ai_charge, 7, NULL},
+ {ai_charge, 7, NULL},
+ {ai_charge, 7, tank_footstep},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}, // 20
- ai_charge, -3, NULL
+ {ai_charge, -3, NULL}
};
mmove_t tank_move_attack_pre_rocket = {FRAME_attak301, FRAME_attak321, tank_frames_attack_pre_rocket, tank_doattack_rocket};
mframe_t tank_frames_attack_fire_rocket [] =
{
- ai_charge, -3, NULL, // Loop Start 22
- ai_charge, 0, NULL,
- ai_charge, 0, TankRocket, // 24
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, TankRocket,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, -1, TankRocket // 30 Loop End
+ {ai_charge, -3, NULL}, // Loop Start 22
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, TankRocket}, // 24
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, TankRocket},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, -1, TankRocket} // 30 Loop End
};
mmove_t tank_move_attack_fire_rocket = {FRAME_attak322, FRAME_attak330, tank_frames_attack_fire_rocket, tank_refire_rocket};
mframe_t tank_frames_attack_post_rocket [] =
{
- ai_charge, 0, NULL, // 31
- ai_charge, -1, NULL,
- ai_charge, -1, NULL,
- ai_charge, 0, NULL,
- ai_charge, 2, NULL,
- ai_charge, 3, NULL,
- ai_charge, 4, NULL,
- ai_charge, 2, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL, // 40
-
- ai_charge, 0, NULL,
- ai_charge, -9, NULL,
- ai_charge, -8, NULL,
- ai_charge, -7, NULL,
- ai_charge, -1, NULL,
- ai_charge, -1, tank_footstep,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL, // 50
-
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL}, // 31
+ {ai_charge, -1, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 2, NULL},
+ {ai_charge, 3, NULL},
+ {ai_charge, 4, NULL},
+ {ai_charge, 2, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}, // 40
+
+ {ai_charge, 0, NULL},
+ {ai_charge, -9, NULL},
+ {ai_charge, -8, NULL},
+ {ai_charge, -7, NULL},
+ {ai_charge, -1, NULL},
+ {ai_charge, -1, tank_footstep},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}, // 50
+
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t tank_move_attack_post_rocket = {FRAME_attak331, FRAME_attak353, tank_frames_attack_post_rocket, tank_run};
mframe_t tank_frames_attack_chain [] =
{
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- NULL, 0, TankMachineGun,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL,
- ai_charge, 0, NULL
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {NULL, 0, TankMachineGun},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL},
+ {ai_charge, 0, NULL}
};
mmove_t tank_move_attack_chain = {FRAME_attak401, FRAME_attak429, tank_frames_attack_chain, tank_run};
@@ -715,38 +715,38 @@
mframe_t tank_frames_death1 [] =
{
- ai_move, -7, NULL,
- ai_move, -2, NULL,
- ai_move, -2, NULL,
- ai_move, 1, NULL,
- ai_move, 3, NULL,
- ai_move, 6, NULL,
- ai_move, 1, NULL,
- ai_move, 1, NULL,
- ai_move, 2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -2, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -3, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, -4, NULL,
- ai_move, -6, NULL,
- ai_move, -4, NULL,
- ai_move, -5, NULL,
- ai_move, -7, NULL,
- ai_move, -15, tank_thud,
- ai_move, -5, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL,
- ai_move, 0, NULL
+ {ai_move, -7, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 3, NULL},
+ {ai_move, 6, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 1, NULL},
+ {ai_move, 2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -2, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -3, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, -6, NULL},
+ {ai_move, -4, NULL},
+ {ai_move, -5, NULL},
+ {ai_move, -7, NULL},
+ {ai_move, -15, tank_thud},
+ {ai_move, -5, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL},
+ {ai_move, 0, NULL}
};
mmove_t tank_move_death = {FRAME_death101, FRAME_death132, tank_frames_death1, tank_dead};
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 240 bytes
Desc: not available
URL: <http://icculus.org/pipermail/quake2/attachments/20020219/f761040e/attachment.pgp>
More information about the quake2
mailing list