diff options
Diffstat (limited to 'src/baseq2/m_hover.c')
-rw-r--r-- | src/baseq2/m_hover.c | 200 |
1 files changed, 87 insertions, 113 deletions
diff --git a/src/baseq2/m_hover.c b/src/baseq2/m_hover.c index 395d0dc..07eb07c 100644 --- a/src/baseq2/m_hover.c +++ b/src/baseq2/m_hover.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -28,7 +28,7 @@ hover #include "g_local.h" #include "m_hover.h" -qboolean visible (edict_t *self, edict_t *other); +qboolean visible(edict_t *self, edict_t *other); static int sound_pain1; @@ -40,30 +40,29 @@ static int sound_search1; static int sound_search2; -void hover_sight (edict_t *self, edict_t *other) +void hover_sight(edict_t *self, edict_t *other) { - gi.sound (self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0); + gi.sound(self, CHAN_VOICE, sound_sight, 1, ATTN_NORM, 0); } -void hover_search (edict_t *self) +void hover_search(edict_t *self) { if (random() < 0.5) - gi.sound (self, CHAN_VOICE, sound_search1, 1, ATTN_NORM, 0); + gi.sound(self, CHAN_VOICE, sound_search1, 1, ATTN_NORM, 0); else - gi.sound (self, CHAN_VOICE, sound_search2, 1, ATTN_NORM, 0); + gi.sound(self, CHAN_VOICE, sound_search2, 1, ATTN_NORM, 0); } -void hover_run (edict_t *self); -void hover_stand (edict_t *self); -void hover_dead (edict_t *self); -void hover_attack (edict_t *self); -void hover_reattack (edict_t *self); -void hover_fire_blaster (edict_t *self); -void hover_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point); +void hover_run(edict_t *self); +void hover_stand(edict_t *self); +void hover_dead(edict_t *self); +void hover_attack(edict_t *self); +void hover_reattack(edict_t *self); +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 [] = -{ +mframe_t hover_frames_stand [] = { { ai_stand, 0, NULL }, { ai_stand, 0, NULL }, { ai_stand, 0, NULL }, @@ -97,8 +96,7 @@ mframe_t hover_frames_stand [] = }; mmove_t hover_move_stand = {FRAME_stand01, FRAME_stand30, hover_frames_stand, NULL}; -mframe_t hover_frames_stop1 [] = -{ +mframe_t hover_frames_stop1 [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, @@ -111,8 +109,7 @@ mframe_t hover_frames_stop1 [] = }; mmove_t hover_move_stop1 = {FRAME_stop101, FRAME_stop109, hover_frames_stop1, NULL}; -mframe_t hover_frames_stop2 [] = -{ +mframe_t hover_frames_stop2 [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, @@ -124,8 +121,7 @@ mframe_t hover_frames_stop2 [] = }; mmove_t hover_move_stop2 = {FRAME_stop201, FRAME_stop208, hover_frames_stop2, NULL}; -mframe_t hover_frames_takeoff [] = -{ +mframe_t hover_frames_takeoff [] = { { ai_move, 0, NULL }, { ai_move, -2, NULL }, { ai_move, 5, NULL }, @@ -159,8 +155,7 @@ mframe_t hover_frames_takeoff [] = }; mmove_t hover_move_takeoff = {FRAME_takeof01, FRAME_takeof30, hover_frames_takeoff, NULL}; -mframe_t hover_frames_pain3 [] = -{ +mframe_t hover_frames_pain3 [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, @@ -173,8 +168,7 @@ mframe_t hover_frames_pain3 [] = }; mmove_t hover_move_pain3 = {FRAME_pain301, FRAME_pain309, hover_frames_pain3, hover_run}; -mframe_t hover_frames_pain2 [] = -{ +mframe_t hover_frames_pain2 [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, @@ -190,8 +184,7 @@ mframe_t hover_frames_pain2 [] = }; mmove_t hover_move_pain2 = {FRAME_pain201, FRAME_pain212, hover_frames_pain2, hover_run}; -mframe_t hover_frames_pain1 [] = -{ +mframe_t hover_frames_pain1 [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 2, NULL }, @@ -223,14 +216,12 @@ mframe_t hover_frames_pain1 [] = }; mmove_t hover_move_pain1 = {FRAME_pain101, FRAME_pain128, hover_frames_pain1, hover_run}; -mframe_t hover_frames_land [] = -{ +mframe_t hover_frames_land [] = { { ai_move, 0, NULL } }; mmove_t hover_move_land = {FRAME_land01, FRAME_land01, hover_frames_land, NULL}; -mframe_t hover_frames_forward [] = -{ +mframe_t hover_frames_forward [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, @@ -269,8 +260,7 @@ mframe_t hover_frames_forward [] = }; mmove_t hover_move_forward = {FRAME_forwrd01, FRAME_forwrd35, hover_frames_forward, NULL}; -mframe_t hover_frames_walk [] = -{ +mframe_t hover_frames_walk [] = { { ai_walk, 4, NULL }, { ai_walk, 4, NULL }, { ai_walk, 4, NULL }, @@ -309,8 +299,7 @@ mframe_t hover_frames_walk [] = }; mmove_t hover_move_walk = {FRAME_forwrd01, FRAME_forwrd35, hover_frames_walk, NULL}; -mframe_t hover_frames_run [] = -{ +mframe_t hover_frames_run [] = { { ai_run, 10, NULL }, { ai_run, 10, NULL }, { ai_run, 10, NULL }, @@ -349,15 +338,14 @@ mframe_t hover_frames_run [] = }; mmove_t hover_move_run = {FRAME_forwrd01, FRAME_forwrd35, hover_frames_run, NULL}; -mframe_t hover_frames_death1 [] = -{ +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, -10, NULL }, { ai_move, 3, NULL }, { ai_move, 5, NULL }, { ai_move, 4, NULL }, @@ -365,8 +353,7 @@ mframe_t hover_frames_death1 [] = }; mmove_t hover_move_death1 = {FRAME_death101, FRAME_death111, hover_frames_death1, hover_dead}; -mframe_t hover_frames_backward [] = -{ +mframe_t hover_frames_backward [] = { { ai_move, 0, NULL }, { ai_move, 0, NULL }, { ai_move, 0, NULL }, @@ -394,16 +381,14 @@ mframe_t hover_frames_backward [] = }; mmove_t hover_move_backward = {FRAME_backwd01, FRAME_backwd24, hover_frames_backward, NULL}; -mframe_t hover_frames_start_attack [] = -{ +mframe_t hover_frames_start_attack [] = { { 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 [] = -{ +mframe_t hover_frames_attack1 [] = { { ai_charge, -10, hover_fire_blaster }, { ai_charge, -10, hover_fire_blaster }, { ai_charge, 0, hover_reattack }, @@ -411,19 +396,17 @@ mframe_t hover_frames_attack1 [] = mmove_t hover_move_attack1 = {FRAME_attak104, FRAME_attak106, hover_frames_attack1, NULL}; -mframe_t hover_frames_end_attack [] = -{ +mframe_t hover_frames_end_attack [] = { { ai_charge, 1, NULL }, { ai_charge, 1, NULL } }; mmove_t hover_move_end_attack = {FRAME_attak107, FRAME_attak108, hover_frames_end_attack, hover_run}; -void hover_reattack (edict_t *self) +void hover_reattack(edict_t *self) { - if (self->enemy->health > 0 ) - if (visible (self, self->enemy) ) - if (random() <= 0.6) - { + if (self->enemy->health > 0) + if (visible(self, self->enemy)) + if (random() <= 0.6) { self->monsterinfo.currentmove = &hover_move_attack1; return; } @@ -431,7 +414,7 @@ void hover_reattack (edict_t *self) } -void hover_fire_blaster (edict_t *self) +void hover_fire_blaster(edict_t *self) { vec3_t start; vec3_t forward, right; @@ -444,23 +427,23 @@ void hover_fire_blaster (edict_t *self) else effect = 0; - AngleVectors (self->s.angles, forward, right, NULL); - G_ProjectSource (self->s.origin, monster_flash_offset[MZ2_HOVER_BLASTER_1], forward, right, start); + AngleVectors(self->s.angles, forward, right, NULL); + G_ProjectSource(self->s.origin, monster_flash_offset[MZ2_HOVER_BLASTER_1], forward, right, start); - VectorCopy (self->enemy->s.origin, end); + VectorCopy(self->enemy->s.origin, end); end[2] += self->enemy->viewheight; - VectorSubtract (end, start, dir); + VectorSubtract(end, start, dir); - monster_fire_blaster (self, start, dir, 1, 1000, MZ2_HOVER_BLASTER_1, effect); + monster_fire_blaster(self, start, dir, 1, 1000, MZ2_HOVER_BLASTER_1, effect); } -void hover_stand (edict_t *self) +void hover_stand(edict_t *self) { - self->monsterinfo.currentmove = &hover_move_stand; + self->monsterinfo.currentmove = &hover_move_stand; } -void hover_run (edict_t *self) +void hover_run(edict_t *self) { if (self->monsterinfo.aiflags & AI_STAND_GROUND) self->monsterinfo.currentmove = &hover_move_stand; @@ -468,12 +451,12 @@ void hover_run (edict_t *self) self->monsterinfo.currentmove = &hover_move_run; } -void hover_walk (edict_t *self) +void hover_walk(edict_t *self) { self->monsterinfo.currentmove = &hover_move_walk; } -void hover_start_attack (edict_t *self) +void hover_start_attack(edict_t *self) { self->monsterinfo.currentmove = &hover_move_start_attack; } @@ -484,7 +467,7 @@ void hover_attack(edict_t *self) } -void hover_pain (edict_t *self, edict_t *other, float kick, int damage) +void hover_pain(edict_t *self, edict_t *other, float kick, int damage) { if (self->health < (self->max_health / 2)) self->s.skinnum = 1; @@ -497,60 +480,52 @@ void hover_pain (edict_t *self, edict_t *other, float kick, int damage) if (skill->value == 3) return; // no pain anims in nightmare - if (damage <= 25) - { - if (random() < 0.5) - { - gi.sound (self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0); + if (damage <= 25) { + if (random() < 0.5) { + gi.sound(self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0); self->monsterinfo.currentmove = &hover_move_pain3; - } - else - { - gi.sound (self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0); + } else { + gi.sound(self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0); self->monsterinfo.currentmove = &hover_move_pain2; } - } - else - { - gi.sound (self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0); + } else { + gi.sound(self, CHAN_VOICE, sound_pain1, 1, ATTN_NORM, 0); self->monsterinfo.currentmove = &hover_move_pain1; } } -void hover_deadthink (edict_t *self) +void hover_deadthink(edict_t *self) { - if (!self->groundentity && level.time < self->timestamp) - { + if (!self->groundentity && level.time < self->timestamp) { self->nextthink = level.time + FRAMETIME; return; } BecomeExplosion1(self); } -void hover_dead (edict_t *self) +void hover_dead(edict_t *self) { - VectorSet (self->mins, -16, -16, -24); - VectorSet (self->maxs, 16, 16, -8); + VectorSet(self->mins, -16, -16, -24); + VectorSet(self->maxs, 16, 16, -8); self->movetype = MOVETYPE_TOSS; self->think = hover_deadthink; self->nextthink = level.time + FRAMETIME; self->timestamp = level.time + 15; - gi.linkentity (self); + gi.linkentity(self); } -void hover_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point) +void hover_die(edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point) { int n; // check for gib - if (self->health <= self->gib_health) - { - gi.sound (self, CHAN_VOICE, gi.soundindex ("misc/udeath.wav"), 1, ATTN_NORM, 0); - for (n= 0; n < 2; n++) - ThrowGib (self, "models/objects/gibs/bone/tris.md2", damage, GIB_ORGANIC); - for (n= 0; n < 2; n++) - ThrowGib (self, "models/objects/gibs/sm_meat/tris.md2", damage, GIB_ORGANIC); - ThrowHead (self, "models/objects/gibs/sm_meat/tris.md2", damage, GIB_ORGANIC); + if (self->health <= self->gib_health) { + gi.sound(self, CHAN_VOICE, gi.soundindex("misc/udeath.wav"), 1, ATTN_NORM, 0); + for (n = 0; n < 2; n++) + ThrowGib(self, "models/objects/gibs/bone/tris.md2", damage, GIB_ORGANIC); + for (n = 0; n < 2; n++) + ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, GIB_ORGANIC); + ThrowHead(self, "models/objects/gibs/sm_meat/tris.md2", damage, GIB_ORGANIC); self->deadflag = DEAD_DEAD; return; } @@ -560,9 +535,9 @@ void hover_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage // regular death if (random() < 0.5) - gi.sound (self, CHAN_VOICE, sound_death1, 1, ATTN_NORM, 0); + gi.sound(self, CHAN_VOICE, sound_death1, 1, ATTN_NORM, 0); else - gi.sound (self, CHAN_VOICE, sound_death2, 1, ATTN_NORM, 0); + gi.sound(self, CHAN_VOICE, sound_death2, 1, ATTN_NORM, 0); self->deadflag = DEAD_DEAD; self->takedamage = DAMAGE_YES; self->monsterinfo.currentmove = &hover_move_death1; @@ -570,31 +545,30 @@ void hover_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damage /*QUAKED monster_hover (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight */ -void SP_monster_hover (edict_t *self) +void SP_monster_hover(edict_t *self) { - if (deathmatch->value) - { - G_FreeEdict (self); + if (deathmatch->value) { + G_FreeEdict(self); return; } - sound_pain1 = gi.soundindex ("hover/hovpain1.wav"); - sound_pain2 = gi.soundindex ("hover/hovpain2.wav"); - sound_death1 = gi.soundindex ("hover/hovdeth1.wav"); - sound_death2 = gi.soundindex ("hover/hovdeth2.wav"); - sound_sight = gi.soundindex ("hover/hovsght1.wav"); - sound_search1 = gi.soundindex ("hover/hovsrch1.wav"); - sound_search2 = gi.soundindex ("hover/hovsrch2.wav"); + sound_pain1 = gi.soundindex("hover/hovpain1.wav"); + sound_pain2 = gi.soundindex("hover/hovpain2.wav"); + sound_death1 = gi.soundindex("hover/hovdeth1.wav"); + sound_death2 = gi.soundindex("hover/hovdeth2.wav"); + sound_sight = gi.soundindex("hover/hovsght1.wav"); + sound_search1 = gi.soundindex("hover/hovsrch1.wav"); + sound_search2 = gi.soundindex("hover/hovsrch2.wav"); - gi.soundindex ("hover/hovatck1.wav"); + gi.soundindex("hover/hovatck1.wav"); - self->s.sound = gi.soundindex ("hover/hovidle1.wav"); + self->s.sound = gi.soundindex("hover/hovidle1.wav"); self->movetype = MOVETYPE_STEP; self->solid = SOLID_BBOX; self->s.modelindex = gi.modelindex("models/monsters/hover/tris.md2"); - VectorSet (self->mins, -24, -24, -24); - VectorSet (self->maxs, 24, 24, 32); + VectorSet(self->mins, -24, -24, -24); + VectorSet(self->maxs, 24, 24, 32); self->health = 240; self->gib_health = -100; @@ -611,10 +585,10 @@ void SP_monster_hover (edict_t *self) self->monsterinfo.sight = hover_sight; self->monsterinfo.search = hover_search; - gi.linkentity (self); + gi.linkentity(self); - self->monsterinfo.currentmove = &hover_move_stand; + self->monsterinfo.currentmove = &hover_move_stand; self->monsterinfo.scale = MODEL_SCALE; - flymonster_start (self); + flymonster_start(self); } |