yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-16 09:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert 76e4017, it was a missmerge

Browse source 
In baseq2 there's no need to force a certain damage texture on gunners
since there's only one. Also gunners can't wear the powershield so
there's no need to turn it of.

This was noticed by Maraakate.
This commit is contained in:
Yamagi Burmeister 2016-12-02 15:51:14 +01:00
parent f6f8394b74
commit c5a6dcf3e0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -388,7 +388,7 @@ gunner_pain(edict_t *self, edict_t *other /* unused */,
if (self->health < (self->max_health / 2))
{
self->s.skinnum |= 1;
self->s.skinnum = 1;
}
if (level.time < self->pain_debounce_time)
@ -476,8 +476,7 @@ gunner_die(edict_t *self, edict_t *inflictor /* unused */,
return;
}
self->s.skinnum |= 1;
self->monsterinfo.power_armor_type = POWER_ARMOR_NONE;
self->s.skinnum = 1;
/* check for gib */
if (self->health <= self->gib_health)