yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-19 16:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move setting health for soldiers above SP_monster_soldier_x().

Browse source 
Otherwise the sound effects may desynchronize after savegame load.
Pointed out by @BjossiAlfreds.
This commit is contained in:
Yamagi 2021-11-05 07:07:03 +01:00
parent e42d2736fa
commit 84746289fa
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/game/monster/soldier/soldier.c
View file

@ -1596,6 +1596,11 @@ SP_monster_soldier_light(edict_t *self)
return;
}
self->health = 20;
self->gib_health = -30;
SP_monster_soldier_x(self);
sound_pain_light = gi.soundindex("soldier/solpain2.wav");
sound_death_light = gi.soundindex("soldier/soldeth2.wav");
gi.modelindex("models/objects/laser/tris.md2");
@ -1603,10 +1608,6 @@ SP_monster_soldier_light(edict_t *self)
gi.soundindex("soldier/solatck2.wav");
self->s.skinnum = 0;
self->health = 20;
self->gib_health = -30;
SP_monster_soldier_x(self);
}
/*
@ -1626,15 +1627,16 @@ SP_monster_soldier(edict_t *self)
return;
}
self->health = 30;
self->gib_health = -30;
SP_monster_soldier_x(self);
sound_pain = gi.soundindex("soldier/solpain1.wav");
sound_death = gi.soundindex("soldier/soldeth1.wav");
gi.soundindex("soldier/solatck1.wav");
self->s.skinnum = 2;
self->health = 30;
self->gib_health = -30;
SP_monster_soldier_x(self);
}
/*
@ -1654,13 +1656,14 @@ SP_monster_soldier_ss(edict_t *self)
return;
}
self->health = 40;
self->gib_health = -30;
SP_monster_soldier_x(self);
sound_pain_ss = gi.soundindex("soldier/solpain3.wav");
sound_death_ss = gi.soundindex("soldier/soldeth3.wav");
gi.soundindex("soldier/solatck3.wav");
self->s.skinnum = 4;
self->health = 40;
self->gib_health = -30;
SP_monster_soldier_x(self);
}