blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2025-02-22 03:31:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved EMPNukeCheck() for plasma rifle in missionpack DLL to the right weapon function- d'oh!

Browse source
This commit is contained in:
Knightmare66 2020-08-09 21:39:41 -04:00
parent 74e4a4f1cc
commit af3214312d
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
missionpack/p_weapon.c
View file

@ -3639,6 +3639,15 @@ void weapon_plasma_rifle_fire (edict_t *ent, qboolean altfire)
VectorSet(offset, 8, 8, ent->viewheight-8);
P_ProjectSource (ent->client, ent->s.origin, offset, forward, right, start);
// Zaero add
if (EMPNukeCheck(ent, start))
{
ent->client->ps.gunframe++;
gi.sound (ent, CHAN_AUTO, gi.soundindex("items/empnuke/emp_missfire.wav"), 1, ATTN_NORM, 0);
return;
}
// end Zaero
if ( ent->client->pers.plasma_mode ) {
gi.sound( ent, CHAN_WEAPON, gi.soundindex(PLASMA_SOUND_FIRE2), 1, ATTN_NORM,0 );
fire_plasma_rifle (ent, start, forward, damage, (int)sk_plasma_rifle_speed_spread->value, true);
@ -3720,15 +3729,6 @@ void kick_attack (edict_t *ent )
VectorMA( start, 25, forward, end );
// Zaero add
if (EMPNukeCheck(ent, start))
{
ent->client->ps.gunframe++;
gi.sound (ent, CHAN_AUTO, gi.soundindex("items/empnuke/emp_missfire.wav"), 1, ATTN_NORM, 0);
return;
}
// end Zaero
tr = gi.trace (ent->s.origin, NULL, NULL, end, ent, MASK_SHOT);
// don't need to check for water