yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2025-02-16 17:11:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed double/quad sounds and monsters not always reacting to teslas

Browse source
This commit is contained in:
BjossiAlfreds 2019-10-03 17:31:20 +00:00
parent 9eead824c7
commit bcc451a817
2 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_combat.c
View file

@ -479,7 +479,7 @@ M_ReactToDamage(edict_t *targ, edict_t *attacker, edict_t *inflictor)
{
new_tesla = MarkTeslaArea(targ, inflictor);
if (new_tesla)
if (new_tesla || !targ->enemy)
{
TargetTesla(targ, inflictor);
}

35
src/g_newweap.c
View file

@ -155,11 +155,15 @@ Prox_Explode(edict_t *ent)
PlayerNoise(owner, ent->s.origin, PNOISE_IMPACT);
}
/* play quad sound if appopriate */
if (ent->dmg > PROX_DAMAGE)
/* play double/quad sound if appopriate */
if (ent->dmg >= (PROX_DAMAGE * 4))
{
gi.sound(ent, CHAN_ITEM, gi.soundindex("items/damage3.wav"), 1, ATTN_NORM, 0);
}
else if (ent->dmg == (PROX_DAMAGE * 2))
{
gi.sound(ent, CHAN_ITEM, gi.soundindex("misc/ddamage3.wav"), 1, ATTN_NORM, 0);
}
ent->takedamage = DAMAGE_NO;
T_RadiusDamage(ent, owner, ent->dmg, ent, PROX_DAMAGE_RADIUS, MOD_PROX);
@ -708,10 +712,14 @@ Nuke_Explode(edict_t *ent)
T_RadiusNukeDamage(ent, ent->teammaster, ent->dmg,
ent, ent->dmg_radius, MOD_NUKE);
if (ent->dmg > NUKE_DAMAGE)
if (ent->dmg >= (NUKE_DAMAGE * 4))
{
gi.sound(ent, CHAN_ITEM, gi.soundindex("items/damage3.wav"), 1, ATTN_NORM, 0);
}
else if (ent->dmg == (NUKE_DAMAGE * 2))
{
gi.sound(ent, CHAN_ITEM, gi.soundindex("misc/ddamage3.wav"), 1, ATTN_NORM, 0);
}
gi.sound(ent, CHAN_NO_PHS_ADD + CHAN_VOICE, gi.soundindex("weapons/grenlx1a.wav"), 1, ATTN_NONE, 0);
@ -957,10 +965,17 @@ tesla_remove(edict_t *self)
self->owner = self->teammaster; /* Going away, set the owner correctly. */
self->enemy = NULL;
/* play quad sound if quadded and an underwater explosion */
if ((self->dmg_radius) && (self->dmg > (TESLA_DAMAGE * TESLA_EXPLOSION_DAMAGE_MULT)))
/* play double/quad sound if doubled/quadded and an underwater explosion */
if (self->dmg_radius)
{
gi.sound(self, CHAN_ITEM, gi.soundindex("items/damage3.wav"), 1, ATTN_NORM, 0);
if (self->dmg >= (TESLA_DAMAGE * TESLA_EXPLOSION_DAMAGE_MULT * 4))
{
gi.sound(self, CHAN_ITEM, gi.soundindex("items/damage3.wav"), 1, ATTN_NORM, 0);
}
else if (self->dmg == (TESLA_DAMAGE * TESLA_EXPLOSION_DAMAGE_MULT * 2))
{
gi.sound(self, CHAN_ITEM, gi.soundindex("misc/ddamage3.wav"), 1, ATTN_NORM, 0);
}
}
Grenade_Explode(self);
@ -1067,11 +1082,15 @@ tesla_think_active(edict_t *self)
{
VectorSubtract(hit->s.origin, start, dir);
/* play quad sound if it's above the "normal" damage */
if (self->dmg > TESLA_DAMAGE)
/* play double/quad sound if it's above the "normal" damage */
if (self->dmg >= (TESLA_DAMAGE * 4))
{
gi.sound(self, CHAN_ITEM, gi.soundindex("items/damage3.wav"), 1, ATTN_NORM, 0);
}
else if (self->dmg == (TESLA_DAMAGE * 2))
{
gi.sound(self, CHAN_ITEM, gi.soundindex("misc/ddamage3.wav"), 1, ATTN_NORM, 0);
}
/* don't do knockback to walking monsters */
if ((hit->svflags & SVF_MONSTER) &&