yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for insane marines not always playing pain sounds

This commit is contained in:
BjossiAlfreds 2019-09-15 13:16:21 +00:00
parent 990e4f6989
commit 80c9976899
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/monster/insane/insane.c
View File

@ -27,6 +27,8 @@
#include "../../header/local.h"
#include "insane.h"
#define SPAWNFLAG_CRUSIFIED 8
static int sound_fist;
static int sound_shake;
static int sound_moan;
@ -62,6 +64,12 @@ insane_moan(edict_t *self)
return;
}
/* suppress screaming so pain sound can play */
if (self->delay > level.time)
{
return;
}
gi.sound(self, CHAN_VOICE, sound_moan, 1, ATTN_IDLE, 0);
}
@ -73,6 +81,12 @@ insane_scream(edict_t *self)
return;
}
/* suppress screaming so pain sound can play */
if (self->delay > level.time)
{
return;
}
gi.sound(self, CHAN_VOICE, sound_scream[randk() % 8], 1, ATTN_IDLE, 0);
}
@ -682,13 +696,16 @@ insane_pain(edict_t *self, edict_t *other /* unused */,
gi.sound(self, CHAN_VOICE, gi.soundindex(va("player/male/pain%i_%i.wav",
l, r)), 1, ATTN_IDLE, 0);
/* suppress screaming and moaning for 1 second so pain sound plays */
self->delay = level.time + 1;
if (skill->value == 3)
{
return; /* no pain anims in nightmare */
}
/* Don't go into pain frames if crucified. */
if (self->spawnflags & 8)
if (self->spawnflags & SPAWNFLAG_CRUSIFIED)
{
self->monsterinfo.currentmove = &insane_move_struggle_cross;
return;
@ -772,7 +789,7 @@ insane_stand(edict_t *self)
return;
}
if (self->spawnflags & 8) /* If crucified */
if (self->spawnflags & SPAWNFLAG_CRUSIFIED) /* If crucified */
{
self->monsterinfo.currentmove = &insane_move_cross;
self->monsterinfo.aiflags |= AI_STAND_GROUND;
@ -801,7 +818,7 @@ insane_dead(edict_t *self)
return;
}
if (self->spawnflags & 8)
if (self->spawnflags & SPAWNFLAG_CRUSIFIED)
{
self->flags |= FL_FLY;
}
@ -862,7 +879,7 @@ insane_die(edict_t *self, edict_t *inflictor /* unused */,
self->deadflag = DEAD_DEAD;
self->takedamage = DAMAGE_YES;
if (self->spawnflags & 8)
if (self->spawnflags & SPAWNFLAG_CRUSIFIED)
{
insane_dead(self);
}
@ -945,7 +962,7 @@ SP_misc_insane(edict_t *self)
self->monsterinfo.scale = MODEL_SCALE;
if (self->spawnflags & 8) /* Crucified ? */
if (self->spawnflags & SPAWNFLAG_CRUSIFIED) /* Crucified ? */
{
VectorSet(self->mins, -16, 0, 0);
VectorSet(self->maxs, 16, 8, 32);