yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-02 05:52:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small fix of skin replacement

Browse source
This commit is contained in:
Yamagi Burmeister 2011-08-16 09:38:13 +00:00
parent 672266241c
commit 76e4017dea
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/game/baseq2/m_gunner.c
View file

@ -283,7 +283,7 @@ mmove_t gunner_move_pain1 = {FRAME_pain101, FRAME_pain118, gunner_frames_pain1,
void gunner_pain (edict_t *self, edict_t *other, float kick, int damage) void gunner_pain (edict_t *self, edict_t *other, float kick, int damage)
{ {
if (self->health < (self->max_health / 2)) if (self->health < (self->max_health / 2))
self->s.skinnum = 1; self->s.skinnum |= 1;
if (level.time < self->pain_debounce_time) if (level.time < self->pain_debounce_time)
return; return;
@ -296,7 +296,7 @@ void gunner_pain (edict_t *self, edict_t *other, float kick, int damage)
gi.sound (self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0); gi.sound (self, CHAN_VOICE, sound_pain2, 1, ATTN_NORM, 0);
if (skill->value == 3) if (skill->value == 3)
return; // no pain anims in nightmare return; // no pain anims in nightmare
if (damage <= 10) if (damage <= 10)
self->monsterinfo.currentmove = &gunner_move_pain3; self->monsterinfo.currentmove = &gunner_move_pain3;
@ -321,9 +321,9 @@ mframe_t gunner_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, -7, NULL}, {ai_move, -7, NULL},
{ai_move, -3, NULL}, {ai_move, -3, NULL},
{ai_move, -5, NULL}, {ai_move, -5, NULL},
{ai_move, 8, NULL}, {ai_move, 8, NULL},
{ai_move, 6, NULL}, {ai_move, 6, NULL},
{ai_move, 0, NULL}, {ai_move, 0, NULL},
@ -336,6 +336,9 @@ void gunner_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damag
{ {
int n; int n;
self->s.skinnum |= 1;
self->monsterinfo.power_armor_type = POWER_ARMOR_NONE;
// check for gib // check for gib
if (self->health <= self->gib_health) if (self->health <= self->gib_health)
{ {