yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 15:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

game: make mframe static and export footstep functions

Browse source
This commit is contained in:
Denis Pauk 2022-08-07 09:50:06 +03:00
parent cfb86acc81
commit 90b14fca24
23 changed files with 301 additions and 281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/sound/openal.c
View file

@ -769,7 +769,7 @@ AL_Overwater()
/* Apply to all sources */
for (i = 0; i < s_numchannels; i++)
{
qalSourcei(s_srcnums[i], AL_DIRECT_FILTER, 0);
qalSourcei(s_srcnums[i], AL_DIRECT_FILTER, AL_FILTER_NULL);
}
}

25
src/game/monster/berserker/berserker.c
View file

@ -37,7 +37,7 @@ static int sound_search;
static int sound_step;
static int sound_step2;
static void
void
berserk_footstep(edict_t *self)
{
if (!g_monsterfootsteps->value)
@ -81,7 +81,7 @@ berserk_search(edict_t *self)
void berserk_fidget(edict_t *self);
mframe_t berserk_frames_stand[] = {
static mframe_t berserk_frames_stand[] = {
{ai_stand, 0, berserk_fidget},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -107,7 +107,7 @@ berserk_stand(edict_t *self)
self->monsterinfo.currentmove = &berserk_move_stand;
}
mframe_t berserk_frames_stand_fidget[] = {
static mframe_t berserk_frames_stand_fidget[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -165,7 +165,7 @@ berserk_fidget(edict_t *self)
gi.sound(self, CHAN_WEAPON, sound_idle, 1, ATTN_IDLE, 0);
}
mframe_t berserk_frames_walk[] = {
static mframe_t berserk_frames_walk[] = {
{ai_walk, 9.1, NULL},
{ai_walk, 6.3, NULL},
{ai_walk, 4.9, NULL},
@ -179,6 +179,7 @@ mframe_t berserk_frames_walk[] = {
{ai_walk, 4.7, NULL},
{ai_walk, 4.8, NULL}
};
mmove_t berserk_move_walk =
{
FRAME_walkc1,
@ -198,7 +199,7 @@ berserk_walk(edict_t *self)
self->monsterinfo.currentmove = &berserk_move_walk;
}
mframe_t berserk_frames_run1[] = {
static mframe_t berserk_frames_run1[] = {
{ai_run, 21, NULL},
{ai_run, 11, berserk_footstep},
{ai_run, 21, NULL},
@ -257,7 +258,7 @@ berserk_swing(edict_t *self)
gi.sound(self, CHAN_WEAPON, sound_punch, 1, ATTN_NORM, 0);
}
mframe_t berserk_frames_attack_spike[] = {
static mframe_t berserk_frames_attack_spike[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, berserk_swing},
@ -290,7 +291,7 @@ berserk_attack_club(edict_t *self)
fire_hit(self, aim, (5 + (randk() % 6)), 400); /* Slower attack */
}
mframe_t berserk_frames_attack_club[] = {
static mframe_t berserk_frames_attack_club[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, berserk_footstep},
@ -320,7 +321,7 @@ berserk_strike(edict_t *self)
very PITA. Let it be... */
}
mframe_t berserk_frames_attack_strike[] = {
static mframe_t berserk_frames_attack_strike[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, berserk_footstep},
@ -363,7 +364,7 @@ berserk_melee(edict_t *self)
}
}
mframe_t berserk_frames_pain1[] = {
static mframe_t berserk_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -377,7 +378,7 @@ mmove_t berserk_move_pain1 =
berserk_frames_pain1,
berserk_run};
mframe_t berserk_frames_pain2[] = {
static mframe_t berserk_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -461,7 +462,7 @@ berserk_dead(edict_t *self)
gi.linkentity(self);
}
mframe_t berserk_frames_death1[] = {
static mframe_t berserk_frames_death1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -485,7 +486,7 @@ mmove_t berserk_move_death1 =
berserk_dead
};
mframe_t berserk_frames_death2[] = {
static mframe_t berserk_frames_death2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

22
src/game/monster/boss2/boss2.c
View file

@ -171,7 +171,7 @@ Boss2MachineGun(edict_t *self)
boss2_firebullet_right(self);
}
mframe_t boss2_frames_stand[] = {
static mframe_t boss2_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -202,7 +202,7 @@ mmove_t boss2_move_stand =
NULL
};
mframe_t boss2_frames_fidget[] = {
static mframe_t boss2_frames_fidget[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -242,7 +242,7 @@ mmove_t boss2_move_fidget =
NULL
};
mframe_t boss2_frames_walk[] = {
static mframe_t boss2_frames_walk[] = {
{ai_walk, 8, NULL},
{ai_walk, 8, NULL},
{ai_walk, 8, NULL},
@ -272,7 +272,7 @@ mmove_t boss2_move_walk = {
NULL
};
mframe_t boss2_frames_run[] = {
static mframe_t boss2_frames_run[] = {
{ai_run, 8, NULL},
{ai_run, 8, NULL},
{ai_run, 8, NULL},
@ -301,7 +301,7 @@ mmove_t boss2_move_run = {
boss2_frames_run,
NULL};
mframe_t boss2_frames_attack_pre_mg[] = {
static mframe_t boss2_frames_attack_pre_mg[] = {
{ai_charge, 1, NULL},
{ai_charge, 1, NULL},
{ai_charge, 1, NULL},
@ -322,7 +322,7 @@ mmove_t boss2_move_attack_pre_mg =
};
/* Loop this */
mframe_t boss2_frames_attack_mg[] = {
static mframe_t boss2_frames_attack_mg[] = {
{ai_charge, 1, Boss2MachineGun},
{ai_charge, 1, Boss2MachineGun},
{ai_charge, 1, Boss2MachineGun},
@ -339,7 +339,7 @@ mmove_t boss2_move_attack_mg =
NULL
};
mframe_t boss2_frames_attack_post_mg[] = {
static mframe_t boss2_frames_attack_post_mg[] = {
{ai_charge, 1, NULL},
{ai_charge, 1, NULL},
{ai_charge, 1, NULL},
@ -354,7 +354,7 @@ mmove_t boss2_move_attack_post_mg =
boss2_run
};
mframe_t boss2_frames_attack_rocket[] = {
static mframe_t boss2_frames_attack_rocket[] = {
{ai_charge, 1, NULL},
{ai_charge, 1, NULL},
{ai_charge, 1, NULL},
@ -386,7 +386,7 @@ mmove_t boss2_move_attack_rocket =
boss2_run
};
mframe_t boss2_frames_pain_heavy[] = {
static mframe_t boss2_frames_pain_heavy[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -414,7 +414,7 @@ mmove_t boss2_move_pain_heavy =
boss2_frames_pain_heavy,
boss2_run};
mframe_t boss2_frames_pain_light[] = {
static mframe_t boss2_frames_pain_light[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -429,7 +429,7 @@ mmove_t boss2_move_pain_light =
boss2_run
};
mframe_t boss2_frames_death[] = {
static mframe_t boss2_frames_death[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

26
src/game/monster/boss3/boss31.c
View file

@ -85,7 +85,7 @@ void jorg_step_left(edict_t *self);
void jorg_step_right(edict_t *self);
void jorg_death_hit(edict_t *self);
mframe_t jorg_frames_stand[] = {
static mframe_t jorg_frames_stand[] = {
{ai_stand, 0, jorg_idle},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -202,7 +202,7 @@ jorg_stand(edict_t *self)
self->monsterinfo.currentmove = &jorg_move_stand;
}
mframe_t jorg_frames_run[] = {
static mframe_t jorg_frames_run[] = {
{ai_run, 17, jorg_step_left},
{ai_run, 0, NULL},
{ai_run, 0, NULL},
@ -227,7 +227,7 @@ mmove_t jorg_move_run =
NULL
};
mframe_t jorg_frames_start_walk[] = {
static mframe_t jorg_frames_start_walk[] = {
{ai_walk, 5, NULL},
{ai_walk, 6, NULL},
{ai_walk, 7, NULL},
@ -243,7 +243,7 @@ mmove_t jorg_move_start_walk =
NULL
};
mframe_t jorg_frames_walk[] = {
static mframe_t jorg_frames_walk[] = {
{ai_walk, 17, NULL},
{ai_walk, 0, NULL},
{ai_walk, 0, NULL},
@ -268,7 +268,7 @@ mmove_t jorg_move_walk =
NULL
};
mframe_t jorg_frames_end_walk[] = {
static mframe_t jorg_frames_end_walk[] = {
{ai_walk, 11, NULL},
{ai_walk, 0, NULL},
{ai_walk, 0, NULL},
@ -314,7 +314,7 @@ jorg_run(edict_t *self)
}
}
mframe_t jorg_frames_pain3[] = {
static mframe_t jorg_frames_pain3[] = {
{ai_move, -28, NULL},
{ai_move, -6, NULL},
{ai_move, -3, jorg_step_left},
@ -350,7 +350,7 @@ mmove_t jorg_move_pain3 =
jorg_run
};
mframe_t jorg_frames_pain2[] = {
static mframe_t jorg_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL}
@ -364,7 +364,7 @@ mmove_t jorg_move_pain2 =
jorg_run
};
mframe_t jorg_frames_pain1[] = {
static mframe_t jorg_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL}
@ -378,7 +378,7 @@ mmove_t jorg_move_pain1 =
jorg_run
};
mframe_t jorg_frames_death1[] = {
static mframe_t jorg_frames_death1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -439,7 +439,7 @@ mmove_t jorg_move_death =
jorg_dead
};
mframe_t jorg_frames_attack2[] = {
static mframe_t jorg_frames_attack2[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -463,7 +463,7 @@ mmove_t jorg_move_attack2 =
jorg_run
};
mframe_t jorg_frames_start_attack1[] = {
static mframe_t jorg_frames_start_attack1[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -482,7 +482,7 @@ mmove_t jorg_move_start_attack1 =
jorg_attack1
};
mframe_t jorg_frames_attack1[] = {
static mframe_t jorg_frames_attack1[] = {
{ai_charge, 0, jorg_firebullet},
{ai_charge, 0, jorg_firebullet},
{ai_charge, 0, jorg_firebullet},
@ -499,7 +499,7 @@ mmove_t jorg_move_attack1 =
jorg_reattack1
};
mframe_t jorg_frames_end_attack1[] = {
static mframe_t jorg_frames_end_attack1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

24
src/game/monster/boss3/boss32.c
View file

@ -78,7 +78,7 @@ makron_taunt(edict_t *self)
}
}
mframe_t makron_frames_stand[] = {
static mframe_t makron_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -160,7 +160,7 @@ makron_stand(edict_t *self)
self->monsterinfo.currentmove = &makron_move_stand;
}
mframe_t makron_frames_run[] = {
static mframe_t makron_frames_run[] = {
{ai_run, 3, makron_step_left},
{ai_run, 12, NULL},
{ai_run, 8, NULL},
@ -247,7 +247,7 @@ makron_prerailgun(edict_t *self)
gi.sound(self, CHAN_WEAPON, sound_prerailgun, 1, ATTN_NORM, 0);
}
mframe_t makron_frames_walk[] = {
static mframe_t makron_frames_walk[] = {
{ai_walk, 3, makron_step_left},
{ai_walk, 12, NULL},
{ai_walk, 8, NULL},
@ -297,7 +297,7 @@ makron_run(edict_t *self)
}
}
mframe_t makron_frames_pain6[] = {
static mframe_t makron_frames_pain6[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -335,7 +335,7 @@ mmove_t makron_move_pain6 =
makron_run
};
mframe_t makron_frames_pain5[] = {
static mframe_t makron_frames_pain5[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -350,7 +350,7 @@ mmove_t makron_move_pain5 =
makron_run
};
mframe_t makron_frames_pain4[] = {
static mframe_t makron_frames_pain4[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -365,7 +365,7 @@ mmove_t makron_move_pain4 =
makron_run
};
mframe_t makron_frames_death2[] = {
static mframe_t makron_frames_death2[] = {
{ai_move, -15, NULL},
{ai_move, 3, NULL},
{ai_move, -12, NULL},
@ -471,7 +471,7 @@ mmove_t makron_move_death2 =
makron_dead
};
mframe_t makron_frames_death3[] = {
static mframe_t makron_frames_death3[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -502,7 +502,7 @@ mmove_t makron_move_death3 =
NULL
};
mframe_t makron_frames_sight[] = {
static mframe_t makron_frames_sight[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -551,7 +551,7 @@ makronBFG(edict_t *self)
monster_fire_bfg(self, start, dir, 50, 300, 100, 300, MZ2_MAKRON_BFG);
}
mframe_t makron_frames_attack3[] = {
static mframe_t makron_frames_attack3[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -570,7 +570,7 @@ mmove_t makron_move_attack3 =
makron_run
};
mframe_t makron_frames_attack4[] = {
static mframe_t makron_frames_attack4[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -607,7 +607,7 @@ mmove_t makron_move_attack4 =
makron_run
};
mframe_t makron_frames_attack5[] = {
static mframe_t makron_frames_attack5[] = {
{ai_charge, 0, makron_prerailgun},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},

28
src/game/monster/brain/brain.c
View file

@ -45,7 +45,7 @@ static int sound_melee3;
static int sound_step;
static int sound_step2;
static void
void
brain_footstep(edict_t *self)
{
if (!g_monsterfootsteps->value)
@ -90,7 +90,7 @@ brain_search(edict_t *self)
void brain_run(edict_t *self);
void brain_dead(edict_t *self);
mframe_t brain_frames_stand[] = {
static mframe_t brain_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -144,7 +144,7 @@ brain_stand(edict_t *self)
self->monsterinfo.currentmove = &brain_move_stand;
}
mframe_t brain_frames_idle[] = {
static mframe_t brain_frames_idle[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -199,7 +199,7 @@ brain_idle(edict_t *self)
self->monsterinfo.currentmove = &brain_move_idle;
}
mframe_t brain_frames_walk1[] = {
static mframe_t brain_frames_walk1[] = {
{ai_walk, 7, NULL},
{ai_walk, 2, NULL},
{ai_walk, 3, NULL},
@ -232,7 +232,7 @@ brain_walk(edict_t *self)
self->monsterinfo.currentmove = &brain_move_walk1;
}
mframe_t brain_frames_defense[] = {
static mframe_t brain_frames_defense[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -252,7 +252,7 @@ mmove_t brain_move_defense =
NULL
};
mframe_t brain_frames_pain3[] = {
static mframe_t brain_frames_pain3[] = {
{ai_move, -2, NULL},
{ai_move, 2, NULL},
{ai_move, 1, NULL},
@ -269,7 +269,7 @@ mmove_t brain_move_pain3 =
brain_run
};
mframe_t brain_frames_pain2[] = {
static mframe_t brain_frames_pain2[] = {
{ai_move, -2, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -288,7 +288,7 @@ mmove_t brain_move_pain2 =
brain_run
};
mframe_t brain_frames_pain1[] = {
static mframe_t brain_frames_pain1[] = {
{ai_move, -6, NULL},
{ai_move, -2, NULL},
{ai_move, -6, brain_footstep},
@ -371,7 +371,7 @@ brain_duck_up(edict_t *self)
gi.linkentity(self);
}
mframe_t brain_frames_duck[] = {
static mframe_t brain_frames_duck[] = {
{ai_move, 0, NULL},
{ai_move, -2, brain_duck_down},
{ai_move, 17, brain_duck_hold},
@ -413,7 +413,7 @@ brain_dodge(edict_t *self, edict_t *attacker, float eta)
self->monsterinfo.currentmove = &brain_move_duck;
}
mframe_t brain_frames_death2[] = {
static mframe_t brain_frames_death2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -429,7 +429,7 @@ mmove_t brain_move_death2 =
brain_dead
};
mframe_t brain_frames_death1[] = {
static mframe_t brain_frames_death1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, -2, NULL},
@ -516,7 +516,7 @@ brain_hit_left(edict_t *self)
}
}
mframe_t brain_frames_attack1[] = {
static mframe_t brain_frames_attack1[] = {
{ai_charge, 8, NULL},
{ai_charge, 3, NULL},
{ai_charge, 5, NULL},
@ -595,7 +595,7 @@ brain_chest_closed(edict_t *self)
}
}
mframe_t brain_frames_attack2[] = {
static mframe_t brain_frames_attack2[] = {
{ai_charge, 5, NULL},
{ai_charge, -4, NULL},
{ai_charge, -4, NULL},
@ -641,7 +641,7 @@ brain_melee(edict_t *self)
}
}
mframe_t brain_frames_run[] = {
static mframe_t brain_frames_run[] = {
{ai_run, 9, NULL},
{ai_run, 2, NULL},
{ai_run, 3, NULL},

37
src/game/monster/chick/chick.c
View file

@ -55,7 +55,8 @@ static int sound_step;
static int sound_step2;
void chick_footstep(edict_t *self)
void
chick_footstep(edict_t *self)
{
if (!g_monsterfootsteps->value)
return;
@ -92,7 +93,7 @@ ChickMoan(edict_t *self)
}
}
mframe_t chick_frames_fidget[] = {
static mframe_t chick_frames_fidget[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -152,7 +153,7 @@ chick_fidget(edict_t *self)
}
}
mframe_t chick_frames_stand[] = {
static mframe_t chick_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -204,7 +205,7 @@ chick_stand(edict_t *self)
self->monsterinfo.currentmove = &chick_move_stand;
}
mframe_t chick_frames_start_run[] = {
static mframe_t chick_frames_start_run[] = {
{ai_run, 1, NULL},
{ai_run, 0, NULL},
{ai_run, 0, NULL},
@ -225,7 +226,7 @@ mmove_t chick_move_start_run =
chick_run
};
mframe_t chick_frames_run[] = {
static mframe_t chick_frames_run[] = {
{ai_run, 6, NULL},
{ai_run, 8, chick_footstep},
{ai_run, 13, NULL},
@ -246,7 +247,7 @@ mmove_t chick_move_run =
NULL
};
mframe_t chick_frames_walk[] = {
static mframe_t chick_frames_walk[] = {
{ai_walk, 6, NULL},
{ai_walk, 8, chick_footstep},
{ai_walk, 13, NULL},
@ -303,7 +304,7 @@ chick_run(edict_t *self)
}
}
mframe_t chick_frames_pain1[] = {
static mframe_t chick_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -319,7 +320,7 @@ mmove_t chick_move_pain1 =
chick_run
};
mframe_t chick_frames_pain2[] = {
static mframe_t chick_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -335,7 +336,7 @@ mmove_t chick_move_pain2 =
chick_run
};
mframe_t chick_frames_pain3[] = {
static mframe_t chick_frames_pain3[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, -6, NULL},
@ -440,7 +441,7 @@ chick_dead(edict_t *self)
gi.linkentity(self);
}
mframe_t chick_frames_death2[] = {
static mframe_t chick_frames_death2[] = {
{ai_move, -6, NULL},
{ai_move, 0, NULL},
{ai_move, -1, NULL},
@ -474,7 +475,7 @@ mmove_t chick_move_death2 =
chick_dead
};
mframe_t chick_frames_death1[] = {
static mframe_t chick_frames_death1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, -7, NULL},
@ -607,7 +608,7 @@ chick_duck_up(edict_t *self)
gi.linkentity(self);
}
mframe_t chick_frames_duck[] = {
static mframe_t chick_frames_duck[] = {
{ai_move, 0, chick_duck_down},
{ai_move, 1, NULL},
{ai_move, 4, chick_duck_hold},
@ -709,7 +710,7 @@ ChickReload(edict_t *self)
gi.sound(self, CHAN_VOICE, sound_missile_reload, 1, ATTN_NORM, 0);
}
mframe_t chick_frames_start_attack1[] = {
static mframe_t chick_frames_start_attack1[] = {
{ai_charge, 0, Chick_PreAttack1},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -732,7 +733,7 @@ mmove_t chick_move_start_attack1 =
chick_frames_start_attack1,
NULL};
mframe_t chick_frames_attack1[] = {
static mframe_t chick_frames_attack1[] = {
{ai_charge, 19, ChickRocket},
{ai_charge, -6, NULL},
{ai_charge, -5, chick_footstep},
@ -757,7 +758,7 @@ mmove_t chick_move_attack1 =
NULL
};
mframe_t chick_frames_end_attack1[] = {
static mframe_t chick_frames_end_attack1[] = {
{ai_charge, -3, NULL},
{ai_charge, 0, NULL},
{ai_charge, -6, NULL},
@ -810,7 +811,7 @@ chick_attack1(edict_t *self)
self->monsterinfo.currentmove = &chick_move_attack1;
}
mframe_t chick_frames_slash[] = {
static mframe_t chick_frames_slash[] = {
{ai_charge, 1, NULL},
{ai_charge, 7, ChickSlash},
{ai_charge, -7, NULL},
@ -830,7 +831,7 @@ mmove_t chick_move_slash =
NULL
};
mframe_t chick_frames_end_slash[] = {
static mframe_t chick_frames_end_slash[] = {
{ai_charge, -6, NULL},
{ai_charge, -1, NULL},
{ai_charge, -6, NULL},
@ -884,7 +885,7 @@ chick_slash(edict_t *self)
self->monsterinfo.currentmove = &chick_move_slash;
}
mframe_t chick_frames_start_slash[] = {
static mframe_t chick_frames_start_slash[] = {
{ai_charge, 1, NULL},
{ai_charge, 8, NULL},
{ai_charge, 3, chick_footstep}

18
src/game/monster/flipper/flipper.c
View file

@ -40,7 +40,7 @@ static int sound_sight;
void flipper_stand(edict_t *self);
mframe_t flipper_frames_stand[] = {
static mframe_t flipper_frames_stand[] = {
{ai_stand, 0, NULL}
};
@ -63,7 +63,7 @@ flipper_stand(edict_t *self)
self->monsterinfo.currentmove = &flipper_move_stand;
}
mframe_t flipper_frames_run[] = {
static mframe_t flipper_frames_run[] = {
{ai_run, FLIPPER_RUN_SPEED, NULL}, /* 6 */
{ai_run, FLIPPER_RUN_SPEED, NULL},
{ai_run, FLIPPER_RUN_SPEED, NULL},
@ -111,7 +111,7 @@ flipper_run_loop(edict_t *self)
self->monsterinfo.currentmove = &flipper_move_run_loop;
}
mframe_t flipper_frames_run_start[] = {
static mframe_t flipper_frames_run_start[] = {
{ai_run, 8, NULL},
{ai_run, 8, NULL},
{ai_run, 8, NULL},
@ -140,7 +140,7 @@ flipper_run(edict_t *self)
}
/* Standard Swimming */
mframe_t flipper_frames_walk[] = {
static mframe_t flipper_frames_walk[] = {
{ai_walk, 4, NULL},
{ai_walk, 4, NULL},
{ai_walk, 4, NULL},
@ -186,7 +186,7 @@ flipper_walk(edict_t *self)
self->monsterinfo.currentmove = &flipper_move_walk;
}
mframe_t flipper_frames_start_run[] = {
static mframe_t flipper_frames_start_run[] = {
{ai_run, 8, NULL},
{ai_run, 8, NULL},
{ai_run, 8, NULL},
@ -213,7 +213,7 @@ flipper_start_run(edict_t *self)
self->monsterinfo.currentmove = &flipper_move_start_run;
}
mframe_t flipper_frames_pain2[] = {
static mframe_t flipper_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -229,7 +229,7 @@ mmove_t flipper_move_pain2 =
flipper_run
};
mframe_t flipper_frames_pain1[] = {
static mframe_t flipper_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -269,7 +269,7 @@ flipper_preattack(edict_t *self)
gi.sound(self, CHAN_WEAPON, sound_chomp, 1, ATTN_NORM, 0);
}
mframe_t flipper_frames_attack[] = {
static mframe_t flipper_frames_attack[] = {
{ai_charge, 0, flipper_preattack},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -380,7 +380,7 @@ flipper_dead(edict_t *self)
gi.linkentity(self);
}
mframe_t flipper_frames_death[] = {
static mframe_t flipper_frames_death[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

24
src/game/monster/float/float.c
View file

@ -98,7 +98,7 @@ floater_fire_blaster(edict_t *self)
monster_fire_blaster(self, start, dir, 1, 1000, MZ2_FLOAT_BLASTER_1, effect);
}
mframe_t floater_frames_stand1[] = {
static mframe_t floater_frames_stand1[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -161,7 +161,7 @@ mmove_t floater_move_stand1 =
NULL
};
mframe_t floater_frames_stand2[] = {
static mframe_t floater_frames_stand2[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -242,7 +242,7 @@ floater_stand(edict_t *self)
}
}
mframe_t floater_frames_activate[] = {
static mframe_t floater_frames_activate[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -283,7 +283,7 @@ mmove_t floater_move_activate =
NULL
};
mframe_t floater_frames_attack1[] = {
static mframe_t floater_frames_attack1[] = {
{ai_charge, 0, NULL}, /* Blaster attack */
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -308,7 +308,7 @@ mmove_t floater_move_attack1 =
floater_run
};
mframe_t floater_frames_attack2[] = {
static mframe_t floater_frames_attack2[] = {
{ai_charge, 0, NULL}, /* Claws */
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -344,7 +344,7 @@ mmove_t floater_move_attack2 =
floater_run
};
mframe_t floater_frames_attack3[] = {
static mframe_t floater_frames_attack3[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -388,7 +388,7 @@ mmove_t floater_move_attack3 =
floater_frames_attack3,
floater_run};
mframe_t floater_frames_death[] = {
static mframe_t floater_frames_death[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -412,7 +412,7 @@ mmove_t floater_move_death =
floater_dead
};
mframe_t floater_frames_pain1[] = {
static mframe_t floater_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -430,7 +430,7 @@ mmove_t floater_move_pain1 =
floater_run
};
mframe_t floater_frames_pain2[] = {
static mframe_t floater_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -449,7 +449,7 @@ mmove_t floater_move_pain2 =
floater_run
};
mframe_t floater_frames_pain3[] = {
static mframe_t floater_frames_pain3[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -472,7 +472,7 @@ mmove_t floater_move_pain3 =
floater_run
};
mframe_t floater_frames_walk[] = {
static mframe_t floater_frames_walk[] = {
{ai_walk, 5, NULL},
{ai_walk, 5, NULL},
{ai_walk, 5, NULL},
@ -535,7 +535,7 @@ mmove_t floater_move_walk =
NULL
};
mframe_t floater_frames_run[] = {
static mframe_t floater_frames_run[] = {
{ai_run, 13, NULL},
{ai_run, 13, NULL},
{ai_run, 13, NULL},

34
src/game/monster/flyer/flyer.c
View file

@ -79,7 +79,7 @@ flyer_pop_blades(edict_t *self)
gi.sound(self, CHAN_VOICE, sound_sproing, 1, ATTN_NORM, 0);
}
mframe_t flyer_frames_stand[] = {
static mframe_t flyer_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -135,7 +135,7 @@ mmove_t flyer_move_stand =
NULL
};
mframe_t flyer_frames_walk[] = {
static mframe_t flyer_frames_walk[] = {
{ai_walk, 5, NULL},
{ai_walk, 5, NULL},
{ai_walk, 5, NULL},
@ -191,7 +191,7 @@ mmove_t flyer_move_walk =
NULL
};
mframe_t flyer_frames_run[] = {
static mframe_t flyer_frames_run[] = {
{ai_run, 10, NULL},
{ai_run, 10, NULL},
{ai_run, 10, NULL},
@ -287,7 +287,7 @@ flyer_stand(edict_t *self)
self->monsterinfo.currentmove = &flyer_move_stand;
}
mframe_t flyer_frames_start[] = {
static mframe_t flyer_frames_start[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -304,7 +304,7 @@ mmove_t flyer_move_start =
NULL
};
mframe_t flyer_frames_stop[] = {
static mframe_t flyer_frames_stop[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -344,7 +344,7 @@ flyer_start(edict_t *self)
self->monsterinfo.currentmove = &flyer_move_start;
}
mframe_t flyer_frames_rollright[] = {
static mframe_t flyer_frames_rollright[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -364,7 +364,7 @@ mmove_t flyer_move_rollright =
NULL
};
mframe_t flyer_frames_rollleft[] = {
static mframe_t flyer_frames_rollleft[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -384,7 +384,7 @@ mmove_t flyer_move_rollleft =
NULL
};
mframe_t flyer_frames_pain3[] = {
static mframe_t flyer_frames_pain3[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -399,7 +399,7 @@ mmove_t flyer_move_pain3 =
flyer_run
};
mframe_t flyer_frames_pain2[] = {
static mframe_t flyer_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -414,7 +414,7 @@ mmove_t flyer_move_pain2 =
flyer_run
};
mframe_t flyer_frames_pain1[] = {
static mframe_t flyer_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -434,7 +434,7 @@ mmove_t flyer_move_pain1 =
flyer_run
};
mframe_t flyer_frames_defense[] = {
static mframe_t flyer_frames_defense[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL}, /* Hold this frame */
@ -451,7 +451,7 @@ mmove_t flyer_move_defense =
NULL
};
mframe_t flyer_frames_bankright[] = {
static mframe_t flyer_frames_bankright[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -469,7 +469,7 @@ mmove_t flyer_move_bankright =
NULL
};
mframe_t flyer_frames_bankleft[] = {
static mframe_t flyer_frames_bankleft[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -545,7 +545,7 @@ flyer_fireright(edict_t *self)
flyer_fire(self, MZ2_FLYER_BLASTER_2);
}
mframe_t flyer_frames_attack2[] = {
static mframe_t flyer_frames_attack2[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -603,7 +603,7 @@ flyer_slash_right(edict_t *self)
gi.sound(self, CHAN_WEAPON, sound_slash, 1, ATTN_NORM, 0);
}
mframe_t flyer_frames_start_melee[] = {
static mframe_t flyer_frames_start_melee[] = {
{ai_charge, 0, flyer_pop_blades},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -620,7 +620,7 @@ mmove_t flyer_move_start_melee =
flyer_loop_melee
};
mframe_t flyer_frames_end_melee[] = {
static mframe_t flyer_frames_end_melee[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL}
@ -634,7 +634,7 @@ mmove_t flyer_move_end_melee =
flyer_run
};
mframe_t flyer_frames_loop_melee[] = {
static 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 */

18
src/game/monster/gladiator/gladiator.c
View file

@ -41,7 +41,7 @@ static int sound_sight;
static int sound_step;
static int sound_step2;
static void
void
gladiator_footstep(edict_t *self)
{
if (!g_monsterfootsteps->value)
@ -105,7 +105,7 @@ gladiator_cleaver_swing(edict_t *self)
gi.sound(self, CHAN_WEAPON, sound_cleaver_swing, 1, ATTN_NORM, 0);
}
mframe_t gladiator_frames_stand[] = {
static mframe_t gladiator_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -133,7 +133,7 @@ gladiator_stand(edict_t *self)
self->monsterinfo.currentmove = &gladiator_move_stand;
}
mframe_t gladiator_frames_walk[] = {
static mframe_t gladiator_frames_walk[] = {
{ai_walk, 15, NULL},
{ai_walk, 7, NULL},
{ai_walk, 6, NULL},
@ -171,7 +171,7 @@ gladiator_walk(edict_t *self)
self->monsterinfo.currentmove = &gladiator_move_walk;
}
mframe_t gladiator_frames_run[] = {
static mframe_t gladiator_frames_run[] = {
{ai_run, 23, NULL},
{ai_run, 14, NULL},
{ai_run, 14, gladiator_footstep},
@ -228,7 +228,7 @@ GaldiatorMelee(edict_t *self)
}
}
mframe_t gladiator_frames_attack_melee[] = {
static mframe_t gladiator_frames_attack_melee[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -290,7 +290,7 @@ GladiatorGun(edict_t *self)
monster_fire_railgun(self, start, dir, 50, 100, MZ2_GLADIATOR_RAILGUN_1);
}
mframe_t gladiator_frames_attack_gun[] = {
static mframe_t gladiator_frames_attack_gun[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -337,7 +337,7 @@ gladiator_attack(edict_t *self)
self->monsterinfo.currentmove = &gladiator_move_attack_gun;
}
mframe_t gladiator_frames_pain[] = {
static mframe_t gladiator_frames_pain[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -354,7 +354,7 @@ mmove_t gladiator_move_pain =
gladiator_run
};
mframe_t gladiator_frames_pain_air[] = {
static mframe_t gladiator_frames_pain_air[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -439,7 +439,7 @@ gladiator_dead(edict_t *self)
gi.linkentity(self);
}
mframe_t gladiator_frames_death[] = {
static mframe_t gladiator_frames_death[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

30
src/game/monster/gunner/gunner.c
View file

@ -38,7 +38,7 @@ static int sound_sight;
static int sound_step;
static int sound_step2;
static void
void
gunner_footstep(edict_t *self)
{
if (!g_monsterfootsteps->value)
@ -99,7 +99,7 @@ void gunner_refire_chain(edict_t *self);
void gunner_stand(edict_t *self);
mframe_t gunner_frames_fidget[] = {
static mframe_t gunner_frames_fidget[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -187,7 +187,7 @@ gunner_fidget(edict_t *self)
}
}
mframe_t gunner_frames_stand[] = {
static mframe_t gunner_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -241,7 +241,7 @@ gunner_stand(edict_t *self)
self->monsterinfo.currentmove = &gunner_move_stand;
}
mframe_t gunner_frames_walk[] = {
static mframe_t gunner_frames_walk[] = {
{ai_walk, 0, gunner_footstep},
{ai_walk, 3, NULL},
{ai_walk, 4, NULL},
@ -276,7 +276,7 @@ gunner_walk(edict_t *self)
self->monsterinfo.currentmove = &gunner_move_walk;
}
mframe_t gunner_frames_run[] = {
static mframe_t gunner_frames_run[] = {
{ai_run, 26, NULL},
{ai_run, 9, gunner_footstep},
{ai_run, 9, NULL},
@ -313,7 +313,7 @@ gunner_run(edict_t *self)
}
}
mframe_t gunner_frames_runandshoot[] = {
static mframe_t gunner_frames_runandshoot[] = {
{ai_run, 32, NULL},
{ai_run, 15, gunner_footstep},
{ai_run, 10, NULL},
@ -341,7 +341,7 @@ gunner_runandshoot(edict_t *self)
self->monsterinfo.currentmove = &gunner_move_runandshoot;
}
mframe_t gunner_frames_pain3[] = {
static mframe_t gunner_frames_pain3[] = {
{ai_move, -3, NULL},
{ai_move, 1, NULL},
{ai_move, 1, NULL},
@ -357,7 +357,7 @@ mmove_t gunner_move_pain3 =
gunner_run
};
mframe_t gunner_frames_pain2[] = {
static mframe_t gunner_frames_pain2[] = {
{ai_move, -2, NULL},
{ai_move, 11, NULL},
{ai_move, 6, gunner_footstep},
@ -376,7 +376,7 @@ mmove_t gunner_move_pain2 =
gunner_run
};
mframe_t gunner_frames_pain1[] = {
static mframe_t gunner_frames_pain1[] = {
{ai_move, 2, NULL},
{ai_move, 0, NULL},
{ai_move, -5, gunner_footstep},
@ -470,7 +470,7 @@ gunner_dead(edict_t *self)
gi.linkentity(self);
}
mframe_t gunner_frames_death[] = {
static mframe_t gunner_frames_death[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -602,7 +602,7 @@ gunner_duck_up(edict_t *self)
gi.linkentity(self);
}
mframe_t gunner_frames_duck[] = {
static mframe_t gunner_frames_duck[] = {
{ai_move, 1, gunner_duck_down},
{ai_move, 1, NULL},
{ai_move, 1, gunner_duck_hold},
@ -725,7 +725,7 @@ GunnerGrenade(edict_t *self)
monster_fire_grenade(self, start, aim, 50, 600, flash_number);
}
mframe_t gunner_frames_attack_chain[] = {
static mframe_t gunner_frames_attack_chain[] = {
{ai_charge, 0, gunner_opengun},
{ai_charge, 0, gunner_footstep},
{ai_charge, 0, NULL},
@ -743,7 +743,7 @@ mmove_t gunner_move_attack_chain =
gunner_fire_chain
};
mframe_t gunner_frames_fire_chain[] = {
static mframe_t gunner_frames_fire_chain[] = {
{ai_charge, 0, GunnerFire},
{ai_charge, 0, GunnerFire},
{ai_charge, 0, GunnerFire},
@ -762,7 +762,7 @@ mmove_t gunner_move_fire_chain =
gunner_refire_chain
};
mframe_t gunner_frames_endfire_chain[] = {
static mframe_t gunner_frames_endfire_chain[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -780,7 +780,7 @@ mmove_t gunner_move_endfire_chain =
gunner_run
};
mframe_t gunner_frames_attack_grenade[] = {
static mframe_t gunner_frames_attack_grenade[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},

32
src/game/monster/hover/hover.c
View file

@ -71,7 +71,7 @@ void hover_fire_blaster(edict_t *self);
void hover_die(edict_t *self, edict_t *inflictor, edict_t *attacker,
int damage, vec3_t point);
mframe_t hover_frames_stand[] = {
static mframe_t hover_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -112,7 +112,7 @@ mmove_t hover_move_stand =
NULL
};
mframe_t hover_frames_stop1[] = {
static mframe_t hover_frames_stop1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -132,7 +132,7 @@ mmove_t hover_move_stop1 =
NULL
};
mframe_t hover_frames_stop2[] = {
static mframe_t hover_frames_stop2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -151,7 +151,7 @@ mmove_t hover_move_stop2 =
NULL
};
mframe_t hover_frames_takeoff[] = {
static mframe_t hover_frames_takeoff[] = {
{ai_move, 0, NULL},
{ai_move, -2, NULL},
{ai_move, 5, NULL},
@ -192,7 +192,7 @@ mmove_t hover_move_takeoff =
NULL
};
mframe_t hover_frames_pain3[] = {
static mframe_t hover_frames_pain3[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -212,7 +212,7 @@ mmove_t hover_move_pain3 =
hover_run
};
mframe_t hover_frames_pain2[] = {
static mframe_t hover_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -235,7 +235,7 @@ mmove_t hover_move_pain2 =
hover_run
};
mframe_t hover_frames_pain1[] = {
static mframe_t hover_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 2, NULL},
@ -274,7 +274,7 @@ mmove_t hover_move_pain1 =
hover_run
};
mframe_t hover_frames_land[] = {
static mframe_t hover_frames_land[] = {
{ai_move, 0, NULL}
};
@ -286,7 +286,7 @@ mmove_t hover_move_land =
NULL
};
mframe_t hover_frames_forward[] = {
static mframe_t hover_frames_forward[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -332,7 +332,7 @@ mmove_t hover_move_forward =
NULL
};
mframe_t hover_frames_walk[] = {
static mframe_t hover_frames_walk[] = {
{ai_walk, 4, NULL},
{ai_walk, 4, NULL},
{ai_walk, 4, NULL},
@ -378,7 +378,7 @@ mmove_t hover_move_walk =
NULL
};
mframe_t hover_frames_run[] = {
static mframe_t hover_frames_run[] = {
{ai_run, 10, NULL},
{ai_run, 10, NULL},
{ai_run, 10, NULL},
@ -424,7 +424,7 @@ mmove_t hover_move_run =
NULL
};
mframe_t hover_frames_death1[] = {
static mframe_t hover_frames_death1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -446,7 +446,7 @@ mmove_t hover_move_death1 =
hover_dead
};
mframe_t hover_frames_backward[] = {
static mframe_t hover_frames_backward[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -481,7 +481,7 @@ mmove_t hover_move_backward =
NULL
};
mframe_t hover_frames_start_attack[] = {
static mframe_t hover_frames_start_attack[] = {
{ai_charge, 1, NULL},
{ai_charge, 1, NULL},
{ai_charge, 1, NULL}
@ -495,7 +495,7 @@ mmove_t hover_move_start_attack =
hover_attack
};
mframe_t hover_frames_attack1[] = {
static mframe_t hover_frames_attack1[] = {
{ai_charge, -10, hover_fire_blaster},
{ai_charge, -10, hover_fire_blaster},
{ai_charge, 0, hover_reattack},
@ -509,7 +509,7 @@ mmove_t hover_move_attack1 =
NULL
};
mframe_t hover_frames_end_attack[] = {
static mframe_t hover_frames_end_attack[] = {
{ai_charge, 1, NULL},
{ai_charge, 1, NULL}
};

26
src/game/monster/infantry/infantry.c
View file

@ -45,7 +45,7 @@ static int sound_idle;
static int sound_step;
static int sound_step2;
static void
void
infantry_footstep(edict_t *self)
{
if (!g_monsterfootsteps->value)
@ -65,7 +65,7 @@ infantry_footstep(edict_t *self)
}
mframe_t infantry_frames_stand[] = {
static mframe_t infantry_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -109,7 +109,7 @@ infantry_stand(edict_t *self)
self->monsterinfo.currentmove = &infantry_move_stand;
}
mframe_t infantry_frames_fidget[] = {
static mframe_t infantry_frames_fidget[] = {
{ai_stand, 1, NULL},
{ai_stand, 0, NULL},
{ai_stand, 1, NULL},
@ -181,7 +181,7 @@ infantry_fidget(edict_t *self)
gi.sound(self, CHAN_VOICE, sound_idle, 1, ATTN_IDLE, 0);
}
mframe_t infantry_frames_walk[] = {
static mframe_t infantry_frames_walk[] = {
{ai_walk, 5, infantry_footstep},
{ai_walk, 4, NULL},
{ai_walk, 4, NULL},
@ -215,7 +215,7 @@ infantry_walk(edict_t *self)
self->monsterinfo.currentmove = &infantry_move_walk;
}
mframe_t infantry_frames_run[] = {
static mframe_t infantry_frames_run[] = {
{ai_run, 10, NULL},
{ai_run, 20, infantry_footstep},
{ai_run, 5, NULL},
@ -247,7 +247,7 @@ infantry_run(edict_t *self)
}
}
mframe_t infantry_frames_pain1[] = {
static mframe_t infantry_frames_pain1[] = {
{ai_move, -3, NULL},
{ai_move, -2, NULL},
{ai_move, -1, NULL},
@ -268,7 +268,7 @@ mmove_t infantry_move_pain1 =
infantry_run
};
mframe_t infantry_frames_pain2[] = {
static mframe_t infantry_frames_pain2[] = {
{ai_move, -3, NULL},
{ai_move, -3, NULL},
{ai_move, 0, NULL},
@ -424,7 +424,7 @@ infantry_dead(edict_t *self)
M_FlyCheck(self);
}
mframe_t infantry_frames_death1[] = {
static mframe_t infantry_frames_death1[] = {
{ai_move, -4, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -456,7 +456,7 @@ mmove_t infantry_move_death1 =
};
/* Off with his head */
mframe_t infantry_frames_death2[] = {
static mframe_t infantry_frames_death2[] = {
{ai_move, 0, NULL},
{ai_move, 1, NULL},
{ai_move, 5, NULL},
@ -492,7 +492,7 @@ mmove_t infantry_move_death2 =
infantry_dead
};
mframe_t infantry_frames_death3[] = {
static mframe_t infantry_frames_death3[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -628,7 +628,7 @@ infantry_duck_up(edict_t *self)
gi.linkentity(self);
}
mframe_t infantry_frames_duck[] = {
static mframe_t infantry_frames_duck[] = {
{ai_move, -2, infantry_duck_down},
{ai_move, -5, infantry_duck_hold},
{ai_move, 3, NULL},
@ -701,7 +701,7 @@ infantry_fire(edict_t *self)
}
}
mframe_t infantry_frames_attack1[] = {
static mframe_t infantry_frames_attack1[] = {
{ai_charge, 4, NULL},
{ai_charge, -1, NULL},
{ai_charge, -1, NULL},
@ -756,7 +756,7 @@ infantry_smack(edict_t *self)
}
}
mframe_t infantry_frames_attack2[] = {
static mframe_t infantry_frames_attack2[] = {
{ai_charge, 3, NULL},
{ai_charge, 6, NULL},
{ai_charge, 0, infantry_swing},

32
src/game/monster/insane/insane.c
View file

@ -39,7 +39,7 @@ static int sound_step2;
static int sound_step3;
static int sound_step4;
static void
void
insane_footstep(edict_t *self)
{
if (!g_monsterfootsteps->value)
@ -132,7 +132,7 @@ void insane_checkdown(edict_t *self);
void insane_checkup(edict_t *self);
void insane_onground(edict_t *self);
mframe_t insane_frames_stand_normal[] = {
static mframe_t insane_frames_stand_normal[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -149,7 +149,7 @@ mmove_t insane_move_stand_normal =
insane_stand
};
mframe_t insane_frames_stand_insane[] = {
static mframe_t insane_frames_stand_insane[] = {
{ai_stand, 0, insane_shake},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -190,7 +190,7 @@ mmove_t insane_move_stand_insane =
insane_stand
};
mframe_t insane_frames_uptodown[] = {
static mframe_t insane_frames_uptodown[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -244,7 +244,7 @@ mmove_t insane_move_uptodown =
insane_onground
};
mframe_t insane_frames_downtoup[] = {
static mframe_t insane_frames_downtoup[] = {
{ai_move, -0.7, NULL}, /* 41 */
{ai_move, -1.2, NULL}, /* 42 */
{ai_move, -1.5, NULL}, /* 43 */
@ -274,7 +274,7 @@ mmove_t insane_move_downtoup =
insane_stand
};
mframe_t insane_frames_jumpdown[] = {
static mframe_t insane_frames_jumpdown[] = {
{ai_move, 0.2, NULL},
{ai_move, 11.5, NULL},
{ai_move, 5.1, NULL},
@ -290,7 +290,7 @@ mmove_t insane_move_jumpdown =
insane_onground
};
mframe_t insane_frames_down[] = {
static mframe_t insane_frames_down[] = {
{ai_move, 0, NULL}, /* 100 */
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -362,7 +362,7 @@ mmove_t insane_move_down =
insane_onground
};
mframe_t insane_frames_walk_normal[] = {
static mframe_t insane_frames_walk_normal[] = {
{ai_walk, 0, insane_scream},
{ai_walk, 2.5, NULL},
{ai_walk, 3.5, NULL},
@ -393,7 +393,7 @@ mmove_t insane_move_run_normal =
insane_run
};
mframe_t insane_frames_walk_insane[] = {
static 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 */
@ -438,7 +438,7 @@ mmove_t insane_move_run_insane =
insane_run
};
mframe_t insane_frames_stand_pain[] = {
static mframe_t insane_frames_stand_pain[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -460,7 +460,7 @@ mmove_t insane_move_stand_pain =
insane_run
};
mframe_t insane_frames_stand_death[] = {
static mframe_t insane_frames_stand_death[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -488,7 +488,7 @@ mmove_t insane_move_stand_death =
insane_dead
};
mframe_t insane_frames_crawl[] = {
static mframe_t insane_frames_crawl[] = {
{ai_walk, 0, insane_scream},
{ai_walk, 1.5, NULL},
{ai_walk, 2.1, NULL},
@ -516,7 +516,7 @@ mmove_t insane_move_runcrawl =
NULL
};
mframe_t insane_frames_crawl_pain[] = {
static mframe_t insane_frames_crawl_pain[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -536,7 +536,7 @@ mmove_t insane_move_crawl_pain =
insane_run
};
mframe_t insane_frames_crawl_death[] = {
static mframe_t insane_frames_crawl_death[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -554,7 +554,7 @@ mmove_t insane_move_crawl_death =
insane_dead
};
mframe_t insane_frames_cross[] = {
static mframe_t insane_frames_cross[] = {
{ai_move, 0, insane_moan},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -580,7 +580,7 @@ mmove_t insane_move_cross =
insane_cross
};
mframe_t insane_frames_struggle_cross[] = {
static mframe_t insane_frames_struggle_cross[] = {
{ai_move, 0, insane_scream},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

22
src/game/monster/medic/medic.c
View file

@ -43,7 +43,7 @@ static int sound_hook_retract;
static int sound_step;
static int sound_step2;
static void
void
medic_footstep(edict_t *self)
{
if (!g_monsterfootsteps->value)
@ -189,7 +189,7 @@ medic_sight(edict_t *self, edict_t *other /* unused */)
gi.sound(self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0);
}
mframe_t medic_frames_stand[] = {
static mframe_t medic_frames_stand[] = {
{ai_stand, 0, medic_idle},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -301,7 +301,7 @@ medic_stand(edict_t *self)
self->monsterinfo.currentmove = &medic_move_stand;
}
mframe_t medic_frames_walk[] = {
static mframe_t medic_frames_walk[] = {
{ai_walk, 6.2, NULL},
{ai_walk, 18.1, medic_footstep},
{ai_walk, 1, NULL},
@ -335,7 +335,7 @@ medic_walk(edict_t *self)
self->monsterinfo.currentmove = &medic_move_walk;
}
mframe_t medic_frames_run[] = {
static mframe_t medic_frames_run[] = {
{ai_run, 18, medic_footstep},
{ai_run, 22.5, NULL},
{ai_run, 25.4, NULL},
@ -387,7 +387,7 @@ medic_run(edict_t *self)
}
}
mframe_t medic_frames_pain1[] = {
static mframe_t medic_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -406,7 +406,7 @@ mmove_t medic_move_pain1 =
medic_run
};
mframe_t medic_frames_pain2[] = {
static mframe_t medic_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -527,7 +527,7 @@ medic_dead(edict_t *self)
gi.linkentity(self);
}
mframe_t medic_frames_death[] = {
static mframe_t medic_frames_death[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -674,7 +674,7 @@ medic_duck_up(edict_t *self)
gi.linkentity(self);
}
mframe_t medic_frames_duck[] = {
static mframe_t medic_frames_duck[] = {
{ai_move, -1, NULL},
{ai_move, -1, NULL},
{ai_move, -1, medic_duck_down},
@ -723,7 +723,7 @@ medic_dodge(edict_t *self, edict_t *attacker, float eta)
self->monsterinfo.currentmove = &medic_move_duck;
}
mframe_t medic_frames_attackHyperBlaster[] = {
static mframe_t medic_frames_attackHyperBlaster[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -767,7 +767,7 @@ medic_continue(edict_t *self)
}
}
mframe_t medic_frames_attackBlaster[] = {
static mframe_t medic_frames_attackBlaster[] = {
{ai_charge, 0, NULL},
{ai_charge, 5, NULL},
{ai_charge, 5, NULL},
@ -929,7 +929,7 @@ medic_hook_retract(edict_t *self)
self->enemy->monsterinfo.aiflags &= ~AI_RESURRECTING;
}
mframe_t medic_frames_attackCable[] = {
static mframe_t medic_frames_attackCable[] = {
{ai_move, 2, NULL},
{ai_move, 3, NULL},
{ai_move, 5, NULL},

24
src/game/monster/mutant/mutant.c
View file

@ -95,7 +95,7 @@ mutant_swing(edict_t *self)
gi.sound(self, CHAN_VOICE, sound_swing, 1, ATTN_NORM, 0);
}
mframe_t mutant_frames_stand[] = {
static mframe_t mutant_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -186,7 +186,7 @@ mutant_idle_loop(edict_t *self)
}
}
mframe_t mutant_frames_idle[] = {
static mframe_t mutant_frames_idle[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -224,7 +224,7 @@ mutant_idle(edict_t *self)
void mutant_walk(edict_t *self);
mframe_t mutant_frames_walk[] = {
static mframe_t mutant_frames_walk[] = {
{ai_walk, 3, mutant_step},
{ai_walk, 1, NULL},
{ai_walk, 5, mutant_step},
@ -258,7 +258,7 @@ mutant_walk_loop(edict_t *self)
self->monsterinfo.currentmove = &mutant_move_walk;
}
mframe_t mutant_frames_start_walk[] = {
static mframe_t mutant_frames_start_walk[] = {
{ai_walk, 5, NULL},
{ai_walk, 5, NULL},
{ai_walk, -2, mutant_step},
@ -284,7 +284,7 @@ mutant_walk(edict_t *self)
self->monsterinfo.currentmove = &mutant_move_start_walk;
}
mframe_t mutant_frames_run[] = {
static mframe_t mutant_frames_run[] = {
{ai_run, 40, NULL},
{ai_run, 40, mutant_step},
{ai_run, 24, NULL},
@ -383,7 +383,7 @@ mutant_check_refire(edict_t *self)
}
}
mframe_t mutant_frames_attack[] = {
static mframe_t mutant_frames_attack[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, mutant_hit_left},
@ -505,7 +505,7 @@ mutant_check_landing(edict_t *self)
}
}
mframe_t mutant_frames_jump[] = {
static mframe_t mutant_frames_jump[] = {
{ai_charge, 0, NULL},
{ai_charge, 17, NULL},
{ai_charge, 15, mutant_jump_takeoff},
@ -621,7 +621,7 @@ mutant_checkattack(edict_t *self)
return false;
}
mframe_t mutant_frames_pain1[] = {
static mframe_t mutant_frames_pain1[] = {
{ai_move, 4, NULL},
{ai_move, -3, NULL},
{ai_move, -8, NULL},
@ -637,7 +637,7 @@ mmove_t mutant_move_pain1 =
mutant_run
};
mframe_t mutant_frames_pain2[] = {
static mframe_t mutant_frames_pain2[] = {
{ai_move, -24, NULL},
{ai_move, 11, NULL},
{ai_move, 5, NULL},
@ -654,7 +654,7 @@ mmove_t mutant_move_pain2 =
mutant_run
};
mframe_t mutant_frames_pain3[] = {
static mframe_t mutant_frames_pain3[] = {
{ai_move, -22, NULL},
{ai_move, 3, NULL},
{ai_move, 3, NULL},
@ -735,7 +735,7 @@ mutant_dead(edict_t *self)
M_FlyCheck(self);
}
mframe_t mutant_frames_death1[] = {
static mframe_t mutant_frames_death1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -755,7 +755,7 @@ mmove_t mutant_move_death1 =
mutant_dead
};
mframe_t mutant_frames_death2[] = {
static mframe_t mutant_frames_death2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

28
src/game/monster/parasite/parasite.c
View file

@ -114,7 +114,7 @@ parasite_search(edict_t *self)
gi.sound(self, CHAN_WEAPON, sound_search, 1, ATTN_IDLE, 0);
}
mframe_t parasite_frames_start_fidget[] = {
static mframe_t parasite_frames_start_fidget[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -129,7 +129,7 @@ mmove_t parasite_move_start_fidget =
parasite_do_fidget
};
mframe_t parasite_frames_fidget[] = {
static mframe_t parasite_frames_fidget[] = {
{ai_stand, 0, parasite_scratch},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -146,7 +146,7 @@ mmove_t parasite_move_fidget =
parasite_refidget
};
mframe_t parasite_frames_end_fidget[] = {
static mframe_t parasite_frames_end_fidget[] = {
{ai_stand, 0, parasite_scratch},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -216,7 +216,7 @@ parasite_idle(edict_t *self)
self->monsterinfo.currentmove = &parasite_move_start_fidget;
}
mframe_t parasite_frames_stand[] = {
static mframe_t parasite_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, parasite_tap},
@ -255,7 +255,7 @@ parasite_stand(edict_t *self)
self->monsterinfo.currentmove = &parasite_move_stand;
}
mframe_t parasite_frames_run[] = {
static mframe_t parasite_frames_run[] = {
{ai_run, 30, NULL},
{ai_run, 30, NULL},
{ai_run, 22, parasite_tap},
@ -273,7 +273,7 @@ mmove_t parasite_move_run =
NULL
};
mframe_t parasite_frames_start_run[] = {
static mframe_t parasite_frames_start_run[] = {
{ai_run, 0, NULL},
{ai_run, 30, NULL},
};
@ -286,7 +286,7 @@ mmove_t parasite_move_start_run =
parasite_run
};
mframe_t parasite_frames_stop_run[] = {
static mframe_t parasite_frames_stop_run[] = {
{ai_run, 20, NULL},
{ai_run, 20, NULL},
{ai_run, 12, parasite_tap},
@ -339,7 +339,7 @@ parasite_run(edict_t *self)
}
}
mframe_t parasite_frames_walk[] = {
static mframe_t parasite_frames_walk[] = {
{ai_walk, 30, NULL},
{ai_walk, 30, NULL},
{ai_walk, 22, NULL},
@ -357,7 +357,7 @@ mmove_t parasite_move_walk =
parasite_walk
};
mframe_t parasite_frames_start_walk[] = {
static mframe_t parasite_frames_start_walk[] = {
{ai_walk, 0, NULL},
{ai_walk, 30, parasite_walk}
};
@ -370,7 +370,7 @@ mmove_t parasite_move_start_walk =
NULL
};
mframe_t parasite_frames_stop_walk[] = {
static mframe_t parasite_frames_stop_walk[] = {
{ai_walk, 20, NULL},
{ai_walk, 20, NULL},
{ai_walk, 12, NULL},
@ -409,7 +409,7 @@ parasite_walk(edict_t *self)
self->monsterinfo.currentmove = &parasite_move_walk;
}
mframe_t parasite_frames_pain1[] = {
static mframe_t parasite_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -567,7 +567,7 @@ parasite_drain_attack(edict_t *self)
vec3_origin, damage, 0, DAMAGE_NO_KNOCKBACK, MOD_UNKNOWN);
}
mframe_t parasite_frames_drain[] = {
static mframe_t parasite_frames_drain[] = {
{ai_charge, 0, parasite_launch},
{ai_charge, 0, NULL},
{ai_charge, 15, parasite_drain_attack}, /* Target hits */
@ -596,7 +596,7 @@ mmove_t parasite_move_drain =
parasite_start_run
};
mframe_t parasite_frames_break[] = {
static mframe_t parasite_frames_break[] = {
{ai_charge, 0, NULL},
{ai_charge, -3, NULL},
{ai_charge, 1, NULL},
@ -666,7 +666,7 @@ parasite_dead(edict_t *self)
gi.linkentity(self);
}
mframe_t parasite_frames_death[] = {
static mframe_t parasite_frames_death[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

44
src/game/monster/soldier/soldier.c
View file

@ -107,7 +107,7 @@ soldier_cock(edict_t *self)
void soldier_stand(edict_t *self);
mframe_t soldier_frames_stand1[] = {
static mframe_t soldier_frames_stand1[] = {
{ai_stand, 0, soldier_idle},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -150,7 +150,7 @@ mmove_t soldier_move_stand1 =
soldier_stand
};
mframe_t soldier_frames_stand3[] = {
static mframe_t soldier_frames_stand3[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -236,7 +236,7 @@ soldier_walk1_random(edict_t *self)
}
}
mframe_t soldier_frames_walk1[] = {
static mframe_t soldier_frames_walk1[] = {
{ai_walk, 3, NULL},
{ai_walk, 6, NULL},
{ai_walk, 2, NULL},
@ -280,7 +280,7 @@ mmove_t soldier_move_walk1 =
NULL
};
mframe_t soldier_frames_walk2[] = {
static mframe_t soldier_frames_walk2[] = {
{ai_walk, 4, soldier_footstep},
{ai_walk, 4, NULL},
{ai_walk, 9, NULL},
@ -321,7 +321,7 @@ soldier_walk(edict_t *self)
void soldier_run(edict_t *self);
mframe_t soldier_frames_start_run[] = {
static mframe_t soldier_frames_start_run[] = {
{ai_run, 7, NULL},
{ai_run, 5, NULL}
};
@ -334,7 +334,7 @@ mmove_t soldier_move_start_run =
soldier_run
};
mframe_t soldier_frames_run[] = {
static mframe_t soldier_frames_run[] = {
{ai_run, 10, NULL},
{ai_run, 11, soldier_footstep},
{ai_run, 11, NULL},
@ -377,7 +377,7 @@ soldier_run(edict_t *self)
}
}
mframe_t soldier_frames_pain1[] = {
static mframe_t soldier_frames_pain1[] = {
{ai_move, -3, NULL},
{ai_move, 4, NULL},
{ai_move, 1, NULL},
@ -393,7 +393,7 @@ mmove_t soldier_move_pain1 =
soldier_run
};
mframe_t soldier_frames_pain2[] = {
static mframe_t soldier_frames_pain2[] = {
{ai_move, -13, NULL},
{ai_move, -1, NULL},
{ai_move, 2, NULL},
@ -411,7 +411,7 @@ mmove_t soldier_move_pain2 =
soldier_run
};
mframe_t soldier_frames_pain3[] = {
static mframe_t soldier_frames_pain3[] = {
{ai_move, -8, NULL},
{ai_move, 10, NULL},
{ai_move, -4, soldier_footstep},
@ -440,7 +440,7 @@ mmove_t soldier_move_pain3 =
soldier_run
};
mframe_t soldier_frames_pain4[] = {
static mframe_t soldier_frames_pain4[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -731,7 +731,7 @@ soldier_attack1_refire2(edict_t *self)
}
}
mframe_t soldier_frames_attack1[] = {
static mframe_t soldier_frames_attack1[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, soldier_fire1},
@ -820,7 +820,7 @@ soldier_attack2_refire2(edict_t *self)
}
}
mframe_t soldier_frames_attack2[] = {
static mframe_t soldier_frames_attack2[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -910,7 +910,7 @@ soldier_attack3_refire(edict_t *self)
}
}
mframe_t soldier_frames_attack3[] = {
static mframe_t soldier_frames_attack3[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, soldier_fire3},
@ -942,7 +942,7 @@ soldier_fire4(edict_t *self)
soldier_fire(self, 3);
}
mframe_t soldier_frames_attack4[] = {
static mframe_t soldier_frames_attack4[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, soldier_footstep},
{ai_charge, 0, soldier_fire4},
@ -995,7 +995,7 @@ soldier_attack6_refire(edict_t *self)
}
}
mframe_t soldier_frames_attack6[] = {
static mframe_t soldier_frames_attack6[] = {
{ai_charge, 10, NULL},
{ai_charge, 4, NULL},
{ai_charge, 12, soldier_footstep},
@ -1089,7 +1089,7 @@ soldier_duck_hold(edict_t *self)
}
}
mframe_t soldier_frames_duck[] = {
static mframe_t soldier_frames_duck[] = {
{ai_move, 5, soldier_duck_down},
{ai_move, -1, soldier_duck_hold},
{ai_move, 1, NULL},
@ -1206,7 +1206,7 @@ soldier_dead(edict_t *self)
gi.linkentity(self);
}
mframe_t soldier_frames_death1[] = {
static mframe_t soldier_frames_death1[] = {
{ai_move, 0, NULL},
{ai_move, -10, NULL},
{ai_move, -10, NULL},
@ -1256,7 +1256,7 @@ mmove_t soldier_move_death1 =
soldier_dead
};
mframe_t soldier_frames_death2[] = {
static mframe_t soldier_frames_death2[] = {
{ai_move, -5, NULL},
{ai_move, -5, NULL},
{ai_move, -5, NULL},
@ -1305,7 +1305,7 @@ mmove_t soldier_move_death2 =
soldier_dead
};
mframe_t soldier_frames_death3[] = {
static mframe_t soldier_frames_death3[] = {
{ai_move, -5, NULL},
{ai_move, -5, NULL},
{ai_move, -5, NULL},
@ -1365,7 +1365,7 @@ mmove_t soldier_move_death3 =
soldier_dead
};
mframe_t soldier_frames_death4[] = {
static mframe_t soldier_frames_death4[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -1434,7 +1434,7 @@ mmove_t soldier_move_death4 =
soldier_dead
};
mframe_t soldier_frames_death5[] = {
static mframe_t soldier_frames_death5[] = {
{ai_move, -5, NULL},
{ai_move, -5, NULL},
{ai_move, -5, NULL},
@ -1471,7 +1471,7 @@ mmove_t soldier_move_death5 =
soldier_dead
};
mframe_t soldier_frames_death6[] = {
static mframe_t soldier_frames_death6[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

30
src/game/monster/supertank/supertank.c
View file

@ -74,7 +74,7 @@ void supertankRocket(edict_t *self);
void supertankMachineGun(edict_t *self);
void supertank_reattack1(edict_t *self);
mframe_t supertank_frames_stand[] = {
static mframe_t supertank_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -156,7 +156,7 @@ supertank_stand(edict_t *self)
self->monsterinfo.currentmove = &supertank_move_stand;
}
mframe_t supertank_frames_run[] = {
static mframe_t supertank_frames_run[] = {
{ai_run, 12, TreadSound},
{ai_run, 12, NULL},
{ai_run, 12, NULL},
@ -185,7 +185,7 @@ mmove_t supertank_move_run =
NULL
};
mframe_t supertank_frames_forward[] = {
static mframe_t supertank_frames_forward[] = {
{ai_walk, 4, TreadSound},
{ai_walk, 4, NULL},
{ai_walk, 4, NULL},
@ -254,7 +254,7 @@ supertank_run(edict_t *self)
}
}
mframe_t supertank_frames_turn_right[] = {
static mframe_t supertank_frames_turn_right[] = {
{ai_move, 0, TreadSound},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -283,7 +283,7 @@ mmove_t supertank_move_turn_right =
supertank_run
};
mframe_t supertank_frames_turn_left[] = {
static mframe_t supertank_frames_turn_left[] = {
{ai_move, 0, TreadSound},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -312,7 +312,7 @@ mmove_t supertank_move_turn_left =
supertank_run
};
mframe_t supertank_frames_pain3[] = {
static mframe_t supertank_frames_pain3[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -327,7 +327,7 @@ mmove_t supertank_move_pain3 =
supertank_run
};
mframe_t supertank_frames_pain2[] = {
static mframe_t supertank_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -342,7 +342,7 @@ mmove_t supertank_move_pain2 =
supertank_run
};
mframe_t supertank_frames_pain1[] = {
static mframe_t supertank_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -357,7 +357,7 @@ mmove_t supertank_move_pain1 =
supertank_run
};
mframe_t supertank_frames_death1[] = {
static mframe_t supertank_frames_death1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -392,7 +392,7 @@ mmove_t supertank_move_death =
supertank_dead
};
mframe_t supertank_frames_backward[] = {
static mframe_t supertank_frames_backward[] = {
{ai_walk, 0, TreadSound},
{ai_walk, 0, NULL},
{ai_walk, 0, NULL},
@ -421,7 +421,7 @@ mmove_t supertank_move_backward =
NULL
};
mframe_t supertank_frames_attack4[] = {
static mframe_t supertank_frames_attack4[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -438,7 +438,7 @@ mmove_t supertank_move_attack4 =
supertank_run
};
mframe_t supertank_frames_attack3[] = {
static mframe_t supertank_frames_attack3[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -476,7 +476,7 @@ mmove_t supertank_move_attack3 =
supertank_run
};
mframe_t supertank_frames_attack2[] = {
static mframe_t supertank_frames_attack2[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -514,7 +514,7 @@ mmove_t supertank_move_attack2 =
supertank_run
};
mframe_t supertank_frames_attack1[] = {
static mframe_t supertank_frames_attack1[] = {
{ai_charge, 0, supertankMachineGun},
{ai_charge, 0, supertankMachineGun},
{ai_charge, 0, supertankMachineGun},
@ -531,7 +531,7 @@ mmove_t supertank_move_attack1 =
supertank_reattack1
};
mframe_t supertank_frames_end_attack1[] = {
static mframe_t supertank_frames_end_attack1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},

38
src/game/monster/tank/tank.c
View file

@ -95,7 +95,7 @@ tank_idle(edict_t *self)
gi.sound(self, CHAN_VOICE, sound_idle, 1, ATTN_IDLE, 0);
}
mframe_t tank_frames_stand[] = {
static mframe_t tank_frames_stand[] = {
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
{ai_stand, 0, NULL},
@ -149,7 +149,7 @@ tank_stand(edict_t *self)
void tank_walk(edict_t *self);
mframe_t tank_frames_start_walk[] = {
static mframe_t tank_frames_start_walk[] = {
{ai_walk, 0, NULL},
{ai_walk, 6, NULL},
{ai_walk, 6, NULL},
@ -164,7 +164,7 @@ mmove_t tank_move_start_walk =
tank_walk
};
mframe_t tank_frames_walk[] = {
static mframe_t tank_frames_walk[] = {
{ai_walk, 4, NULL},
{ai_walk, 5, NULL},
{ai_walk, 3, NULL},
@ -191,7 +191,7 @@ mmove_t tank_move_walk =
NULL
};
mframe_t tank_frames_stop_walk[] = {
static mframe_t tank_frames_stop_walk[] = {
{ai_walk, 3, NULL},
{ai_walk, 3, NULL},
{ai_walk, 2, NULL},
@ -220,7 +220,7 @@ tank_walk(edict_t *self)
void tank_run(edict_t *self);
mframe_t tank_frames_start_run[] = {
static mframe_t tank_frames_start_run[] = {
{ai_run, 0, NULL},
{ai_run, 6, NULL},
{ai_run, 6, NULL},
@ -235,7 +235,7 @@ mmove_t tank_move_start_run =
tank_run
};
mframe_t tank_frames_run[] = {
static mframe_t tank_frames_run[] = {
{ai_run, 4, NULL},
{ai_run, 5, NULL},
{ai_run, 3, NULL},
@ -262,7 +262,7 @@ mmove_t tank_move_run =
NULL
};
mframe_t tank_frames_stop_run[] = {
static mframe_t tank_frames_stop_run[] = {
{ai_run, 3, NULL},
{ai_run, 3, NULL},
{ai_run, 2, NULL},
@ -312,7 +312,7 @@ tank_run(edict_t *self)
}
}
mframe_t tank_frames_pain1[] = {
static mframe_t tank_frames_pain1[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -327,7 +327,7 @@ mmove_t tank_move_pain1 =
tank_run
};
mframe_t tank_frames_pain2[] = {
static mframe_t tank_frames_pain2[] = {
{ai_move, 0, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -343,7 +343,7 @@ mmove_t tank_move_pain2 =
tank_run
};
mframe_t tank_frames_pain3[] = {
static mframe_t tank_frames_pain3[] = {
{ai_move, -7, NULL},
{ai_move, 0, NULL},
{ai_move, 0, NULL},
@ -574,7 +574,7 @@ TankMachineGun(edict_t *self)
flash_number);
}
mframe_t tank_frames_attack_blast[] = {
static mframe_t tank_frames_attack_blast[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -601,7 +601,7 @@ mmove_t tank_move_attack_blast =
tank_reattack_blaster
};
mframe_t tank_frames_reattack_blast[] = {
static mframe_t tank_frames_reattack_blast[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, TankBlaster},
@ -618,7 +618,7 @@ mmove_t tank_move_reattack_blast =
tank_reattack_blaster
};
mframe_t tank_frames_attack_post_blast[] = {
static mframe_t tank_frames_attack_post_blast[] = {
{ai_move, 0, NULL}, /* 17 */
{ai_move, 0, NULL},
{ai_move, 2, NULL},
@ -673,7 +673,7 @@ tank_poststrike(edict_t *self)
tank_run(self);
}
mframe_t tank_frames_attack_strike[] = {
static mframe_t tank_frames_attack_strike[] = {
{ai_move, 3, NULL},
{ai_move, 2, NULL},
{ai_move, 2, NULL},
@ -722,7 +722,7 @@ mmove_t tank_move_attack_strike =
tank_poststrike
};
mframe_t tank_frames_attack_pre_rocket[] = {
static mframe_t tank_frames_attack_pre_rocket[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -756,7 +756,7 @@ mmove_t tank_move_attack_pre_rocket =
tank_doattack_rocket
};
mframe_t tank_frames_attack_fire_rocket[] = {
static mframe_t tank_frames_attack_fire_rocket[] = {
{ai_charge, -3, NULL}, /* Loop Start 22 */
{ai_charge, 0, NULL},
{ai_charge, 0, TankRocket}, /* 24 */
@ -776,7 +776,7 @@ mmove_t tank_move_attack_fire_rocket =
tank_refire_rocket
};
mframe_t tank_frames_attack_post_rocket[] = {
static mframe_t tank_frames_attack_post_rocket[] = {
{ai_charge, 0, NULL}, /* 31 */
{ai_charge, -1, NULL},
{ai_charge, -1, NULL},
@ -812,7 +812,7 @@ mmove_t tank_move_attack_post_rocket =
tank_run
};
mframe_t tank_frames_attack_chain[] = {
static mframe_t tank_frames_attack_chain[] = {
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
{ai_charge, 0, NULL},
@ -971,7 +971,7 @@ tank_dead(edict_t *self)
gi.linkentity(self);
}
mframe_t tank_frames_death1[] = {
static mframe_t tank_frames_death1[] = {
{ai_move, -7, NULL},
{ai_move, -2, NULL},
{ai_move, -2, NULL},

9
src/game/savegame/tables/gamefunc_decs.h
View file

@ -241,6 +241,7 @@ extern void SP_monster_soldier_ss ( edict_t * self ) ;
extern void SP_monster_soldier ( edict_t * self ) ;
extern void SP_monster_soldier_light ( edict_t * self ) ;
extern void SP_monster_soldier_x ( edict_t * self ) ;
extern void soldier_footstep( edict_t *self ) ;
extern void soldier_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
extern void soldier_dead ( edict_t * self ) ;
extern void soldier_fire7 ( edict_t * self ) ;
@ -327,6 +328,7 @@ extern void M_ChangeYaw ( edict_t * ent ) ;
extern qboolean SV_movestep ( edict_t * ent , vec3_t move , qboolean relink ) ;
extern qboolean M_CheckBottom ( edict_t * ent ) ;
extern void SP_monster_medic ( edict_t * self ) ;
extern void medic_footstep( edict_t *self ) ;
extern qboolean medic_checkattack ( edict_t * self ) ;
extern void medic_attack ( edict_t * self ) ;
extern void medic_hook_retract ( edict_t * self ) ;
@ -349,6 +351,7 @@ extern void medic_search ( edict_t * self ) ;
extern void medic_idle ( edict_t * self ) ;
extern edict_t * medic_FindDeadMonster ( edict_t * self ) ;
extern void SP_misc_insane ( edict_t * self ) ;
extern void insane_footstep( edict_t *self ) ;
extern void insane_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
extern void insane_dead ( edict_t * self ) ;
extern void insane_stand ( edict_t * self ) ;
@ -364,6 +367,7 @@ extern void insane_moan ( edict_t * self ) ;
extern void insane_shake ( edict_t * self ) ;
extern void insane_fist ( edict_t * self ) ;
extern void SP_monster_infantry ( edict_t * self ) ;
extern void infantry_footstep( edict_t *self ) ;
extern void infantry_attack ( edict_t * self ) ;
extern void infantry_smack ( edict_t * self ) ;
extern void infantry_swing ( edict_t * self ) ;
@ -397,6 +401,7 @@ extern void hover_reattack ( edict_t * self ) ;
extern void hover_search ( edict_t * self ) ;
extern void hover_sight ( edict_t * self , edict_t * other ) ;
extern void SP_monster_gunner ( edict_t * self ) ;
extern void gunner_footstep( edict_t *self ) ;
extern void gunner_refire_chain ( edict_t * self ) ;
extern void gunner_fire_chain ( edict_t * self ) ;
extern void gunner_attack ( edict_t * self ) ;
@ -419,6 +424,7 @@ extern void gunner_search ( edict_t * self ) ;
extern void gunner_sight ( edict_t * self , edict_t * other ) ;
extern void gunner_idlesound ( edict_t * self ) ;
extern void SP_monster_gladiator ( edict_t * self ) ;
extern void gladiator_footstep( edict_t *self ) ;
extern void gladiator_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
extern void gladiator_dead ( edict_t * self ) ;
extern void gladiator_pain ( edict_t * self , edict_t * other , float kick , int damage ) ;
@ -483,6 +489,7 @@ extern void flipper_run ( edict_t * self ) ;
extern void flipper_run_loop ( edict_t * self ) ;
extern void flipper_stand ( edict_t * self ) ;
extern void SP_monster_chick ( edict_t * self ) ;
extern void chick_footstep( edict_t *self ) ;
extern void chick_sight ( edict_t * self , edict_t * other ) ;
extern void chick_attack ( edict_t * self ) ;
extern void chick_melee ( edict_t * self ) ;
@ -507,6 +514,7 @@ extern void chick_stand ( edict_t * self ) ;
extern void chick_fidget ( edict_t * self ) ;
extern void ChickMoan ( edict_t * self ) ;
extern void SP_monster_brain ( edict_t * self ) ;
extern void brain_footstep( edict_t *self ) ;
extern void brain_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
extern void brain_dead ( edict_t * self ) ;
extern void brain_pain ( edict_t * self , edict_t * other , float kick , int damage ) ;
@ -594,6 +602,7 @@ extern void boss2_firebullet_right ( edict_t * self ) ;
extern void Boss2Rocket ( edict_t * self ) ;
extern void boss2_search ( edict_t * self ) ;
extern void SP_monster_berserk ( edict_t * self ) ;
extern void berserk_footstep( edict_t *self ) ;
extern void berserk_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
extern void berserk_dead ( edict_t * self ) ;
extern void berserk_pain ( edict_t * self , edict_t * other , float kick , int damage ) ;

9
src/game/savegame/tables/gamefunc_list.h
View file

@ -241,6 +241,7 @@
{"SP_monster_soldier", (byte *)SP_monster_soldier},
{"SP_monster_soldier_light", (byte *)SP_monster_soldier_light},
{"SP_monster_soldier_x", (byte *)SP_monster_soldier_x},
{"soldier_footstep", (byte *)soldier_footstep},
{"soldier_die", (byte *)soldier_die},
{"soldier_dead", (byte *)soldier_dead},
{"soldier_fire7", (byte *)soldier_fire7},
@ -327,6 +328,7 @@
{"SV_movestep", (byte *)SV_movestep},
{"M_CheckBottom", (byte *)M_CheckBottom},
{"SP_monster_medic", (byte *)SP_monster_medic},
{"medic_footstep", (byte *)medic_footstep},
{"medic_checkattack", (byte *)medic_checkattack},
{"medic_attack", (byte *)medic_attack},
{"medic_hook_retract", (byte *)medic_hook_retract},
@ -349,6 +351,7 @@
{"medic_idle", (byte *)medic_idle},
{"medic_FindDeadMonster", (byte *)medic_FindDeadMonster},
{"SP_misc_insane", (byte *)SP_misc_insane},
{"insane_footstep", (byte *)insane_footstep},
{"insane_die", (byte *)insane_die},
{"insane_dead", (byte *)insane_dead},
{"insane_stand", (byte *)insane_stand},
@ -364,6 +367,7 @@
{"insane_shake", (byte *)insane_shake},
{"insane_fist", (byte *)insane_fist},
{"SP_monster_infantry", (byte *)SP_monster_infantry},
{"infantry_footstep", (byte *)infantry_footstep},
{"infantry_attack", (byte *)infantry_attack},
{"infantry_smack", (byte *)infantry_smack},
{"infantry_swing", (byte *)infantry_swing},
@ -397,6 +401,7 @@
{"hover_search", (byte *)hover_search},
{"hover_sight", (byte *)hover_sight},
{"SP_monster_gunner", (byte *)SP_monster_gunner},
{"gunner_footstep", (byte *)gunner_footstep},
{"gunner_refire_chain", (byte *)gunner_refire_chain},
{"gunner_fire_chain", (byte *)gunner_fire_chain},
{"gunner_attack", (byte *)gunner_attack},
@ -419,6 +424,7 @@
{"gunner_sight", (byte *)gunner_sight},
{"gunner_idlesound", (byte *)gunner_idlesound},
{"SP_monster_gladiator", (byte *)SP_monster_gladiator},
{"gladiator_footstep", (byte *)gladiator_footstep},
{"gladiator_die", (byte *)gladiator_die},
{"gladiator_dead", (byte *)gladiator_dead},
{"gladiator_pain", (byte *)gladiator_pain},
@ -483,6 +489,7 @@
{"flipper_run_loop", (byte *)flipper_run_loop},
{"flipper_stand", (byte *)flipper_stand},
{"SP_monster_chick", (byte *)SP_monster_chick},
{"chick_footstep", (byte *)chick_footstep},
{"chick_sight", (byte *)chick_sight},
{"chick_attack", (byte *)chick_attack},
{"chick_melee", (byte *)chick_melee},
@ -507,6 +514,7 @@
{"chick_fidget", (byte *)chick_fidget},
{"ChickMoan", (byte *)ChickMoan},
{"SP_monster_brain", (byte *)SP_monster_brain},
{"brain_footstep", (byte *)brain_footstep},
{"brain_die", (byte *)brain_die},
{"brain_dead", (byte *)brain_dead},
{"brain_pain", (byte *)brain_pain},
@ -594,6 +602,7 @@
{"Boss2Rocket", (byte *)Boss2Rocket},
{"boss2_search", (byte *)boss2_search},
{"SP_monster_berserk", (byte *)SP_monster_berserk},
{"berserk_footstep", (byte *)berserk_footstep},
{"berserk_die", (byte *)berserk_die},
{"berserk_dead", (byte *)berserk_dead},
{"berserk_pain", (byte *)berserk_pain},