id-software/quake2-rerelease-dll
1
0
Fork 0
mirror of https://github.com/id-Software/quake2-rerelease-dll.git synced 2026-03-20 08:59:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update 1 changes

Browse Source
This commit is contained in:
Mike Rubits
2023-10-03 14:43:06 -04:00
parent 60f29560f3
commit 8dc1fc9794
67 changed files with 1806 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
rerelease/m_soldier.cpp
View File

@@ -12,16 +12,16 @@ SOLDIER
#include "m_soldier.h"
#include "m_flash.h"
static int sound_idle;
static int sound_sight1;
static int sound_sight2;
static int sound_pain_light;
static int sound_pain;
static int sound_pain_ss;
static int sound_death_light;
static int sound_death;
static int sound_death_ss;
static int sound_cock;
static cached_soundindex sound_idle;
static cached_soundindex sound_sight1;
static cached_soundindex sound_sight2;
static cached_soundindex sound_pain_light;
static cached_soundindex sound_pain;
static cached_soundindex sound_pain_ss;
static cached_soundindex sound_death_light;
static cached_soundindex sound_death;
static cached_soundindex sound_death_ss;
static cached_soundindex sound_cock;
void soldier_start_charge(edict_t *self)
{
@@ -648,6 +648,13 @@ void soldier_fire_xatrix(edict_t *self, int flash_number, bool angle_limited)
}
else
{
// [Paril-KEX] no enemy = no fire
if ((!self->enemy) || (!self->enemy->inuse))
{
self->monsterinfo.aiflags &= ~AI_HOLD_FRAME;
return;
}
// PMM
if (self->monsterinfo.attack_state == AS_BLIND)
end = self->monsterinfo.blind_fire_target;
@@ -1838,10 +1845,10 @@ void SP_monster_soldier_x(edict_t *self)
self->movetype = MOVETYPE_STEP;
self->solid = SOLID_BBOX;
sound_idle = gi.soundindex("soldier/solidle1.wav");
sound_sight1 = gi.soundindex("soldier/solsght1.wav");
sound_sight2 = gi.soundindex("soldier/solsrch1.wav");
sound_cock = gi.soundindex("infantry/infatck3.wav");
sound_idle.assign("soldier/solidle1.wav");
sound_sight1.assign("soldier/solsght1.wav");
sound_sight2.assign("soldier/solsrch1.wav");
sound_cock.assign("infantry/infatck3.wav");
gi.modelindex("models/monsters/soldier/gibs/head.md2");
gi.modelindex("models/monsters/soldier/gibs/gun.md2");
@@ -1897,8 +1904,8 @@ void SP_monster_soldier_light(edict_t *self)
SP_monster_soldier_x(self);
sound_pain_light = gi.soundindex("soldier/solpain2.wav");
sound_death_light = gi.soundindex("soldier/soldeth2.wav");
sound_pain_light.assign("soldier/solpain2.wav");
sound_death_light.assign("soldier/soldeth2.wav");
gi.modelindex("models/objects/laser/tris.md2");
gi.soundindex("misc/lasfly.wav");
gi.soundindex("soldier/solatck2.wav");
@@ -1923,8 +1930,8 @@ void SP_monster_soldier(edict_t *self)
SP_monster_soldier_x(self);
sound_pain = gi.soundindex("soldier/solpain1.wav");
sound_death = gi.soundindex("soldier/soldeth1.wav");
sound_pain.assign("soldier/solpain1.wav");
sound_death.assign("soldier/soldeth1.wav");
gi.soundindex("soldier/solatck1.wav");
self->s.skinnum = 2;
@@ -1944,8 +1951,8 @@ void SP_monster_soldier_ss(edict_t *self)
SP_monster_soldier_x(self);
sound_pain_ss = gi.soundindex("soldier/solpain3.wav");
sound_death_ss = gi.soundindex("soldier/soldeth3.wav");
sound_pain_ss.assign("soldier/solpain3.wav");
sound_death_ss.assign("soldier/soldeth3.wav");
gi.soundindex("soldier/solatck3.wav");
self->s.skinnum = 4;
@@ -1975,8 +1982,8 @@ void SP_monster_soldier_ripper(edict_t *self)
SP_monster_soldier_h(self);
sound_pain_light = gi.soundindex("soldier/solpain2.wav");
sound_death_light = gi.soundindex("soldier/soldeth2.wav");
sound_pain_light.assign("soldier/solpain2.wav");
sound_death_light.assign("soldier/soldeth2.wav");
gi.modelindex("models/objects/boomrang/tris.md2");
gi.soundindex("misc/lasfly.wav");
@@ -2003,8 +2010,8 @@ void SP_monster_soldier_hypergun(edict_t *self)
SP_monster_soldier_h(self);
gi.modelindex("models/objects/laser/tris.md2");
sound_pain = gi.soundindex("soldier/solpain1.wav");
sound_death = gi.soundindex("soldier/soldeth1.wav");
sound_pain.assign("soldier/solpain1.wav");
sound_death.assign("soldier/soldeth1.wav");
gi.soundindex("soldier/solatck1.wav");
gi.soundindex("weapons/hyprbd1a.wav");
gi.soundindex("weapons/hyprbl1a.wav");
@@ -2029,8 +2036,8 @@ void SP_monster_soldier_lasergun(edict_t *self)
SP_monster_soldier_h(self);
sound_pain_ss = gi.soundindex("soldier/solpain3.wav");
sound_death_ss = gi.soundindex("soldier/soldeth3.wav");
sound_pain_ss.assign("soldier/solpain3.wav");
sound_death_ss.assign("soldier/soldeth3.wav");
gi.soundindex("soldier/solatck3.wav");
self->s.skinnum = 10;