From 0ebc6eca38a6f13e1c2a4c6dec6887d215b51c12 Mon Sep 17 00:00:00 2001 From: BjossiAlfreds Date: Thu, 2 Jan 2020 11:12:50 +0000 Subject: [PATCH] Fix for insane marines not firing deathtarget right away --- src/header/local.h | 4 ++-- src/monster/insane/insane.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/header/local.h b/src/header/local.h index 1816d91..f91fca6 100644 --- a/src/header/local.h +++ b/src/header/local.h @@ -1031,10 +1031,10 @@ struct edict_s void (*die)(edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point); - float touch_debounce_time; /* are all these legit? do we need more/less of them? */ + float touch_debounce_time; float pain_debounce_time; float damage_debounce_time; - float fly_sound_debounce_time; /* move to clientinfo */ + float fly_sound_debounce_time; /* now also used by insane marines to store pain sound timeout */ float last_move_time; int health; diff --git a/src/monster/insane/insane.c b/src/monster/insane/insane.c index 844f4c6..ff73fec 100644 --- a/src/monster/insane/insane.c +++ b/src/monster/insane/insane.c @@ -55,7 +55,7 @@ insane_moan(edict_t *self) } /* suppress screaming so pain sound can play */ - if (self->delay > level.time) + if (self->fly_sound_debounce_time > level.time) { return; } @@ -72,7 +72,7 @@ insane_scream(edict_t *self) } /* suppress screaming so pain sound can play */ - if (self->delay > level.time) + if (self->fly_sound_debounce_time > level.time) { return; } @@ -660,7 +660,7 @@ insane_pain(edict_t *self, edict_t *other /* unused */, 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; + self->fly_sound_debounce_time = level.time + 1; if (skill->value == 3) {