yquake2/xatrix
0
0
Fork 0
mirror of https://github.com/yquake2/xatrix.git synced 2025-02-23 20:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #65 from BjossiAlfreds/player-sounds

Browse source 
Fix for some player sound bugs
This commit is contained in:
Yamagi 2021-04-30 11:51:51 +02:00 committed by GitHub
commit f4ae2e8c8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/header/local.h
View file

@ -1067,7 +1067,7 @@ struct edict_s
int dmg; int dmg;
int radius_dmg; int radius_dmg;
float dmg_radius; float dmg_radius;
int sounds; /* make this a spawntemp var? */ int sounds; /* now also used for player death sound aggregation */
int count; int count;
edict_t *chain; edict_t *chain;

13
src/player/client.c
View file

@ -663,9 +663,8 @@ player_die(edict_t *self, edict_t *inflictor, edict_t *attacker,
if (self->health < -40) if (self->health < -40)
{ {
/* gib */ /* gib (sound played at end of server frame) */
gi.sound(self, CHAN_BODY, gi.soundindex("misc/udeath.wav"), self->sounds = gi.soundindex("misc/udeath.wav");
1, ATTN_NORM, 0);
for (n = 0; n < 4; n++) for (n = 0; n < 4; n++)
{ {
@ -713,8 +712,12 @@ player_die(edict_t *self, edict_t *inflictor, edict_t *attacker,
} }
} }
gi.sound(self, CHAN_VOICE, gi.soundindex(va("*death%i.wav", /* sound played at end of server frame */
(rand() % 4) + 1)), 1, ATTN_NORM, 0); if (!self->sounds)
{
self->sounds = gi.soundindex(va("*death%i.wav",
(rand() % 4) + 1));
}
} }
} }

20
src/player/view.c
View file

@ -63,6 +63,13 @@ P_DamageFeedback(edict_t *player)
return; return;
} }
/* death/gib sound is aggregated and played here */
if (player->sounds)
{
gi.sound (player, CHAN_VOICE, player->sounds, 1, ATTN_NORM, 0);
player->sounds = 0;
}
client = player->client; client = player->client;
/* flash the backgrounds behind the status numbers */ /* flash the backgrounds behind the status numbers */
@ -132,7 +139,8 @@ P_DamageFeedback(edict_t *player)
/* play an apropriate pain sound */ /* play an apropriate pain sound */
if ((level.time > player->pain_debounce_time) && if ((level.time > player->pain_debounce_time) &&
!(player->flags & FL_GODMODE) && !(player->flags & FL_GODMODE) &&
(client->invincible_framenum <= level.framenum)) (client->invincible_framenum <= level.framenum) &&
player->health > 0)
{ {
r = 1 + (rand() & 1); r = 1 + (rand() & 1);
player->pain_debounce_time = level.time + 0.7; player->pain_debounce_time = level.time + 0.7;
@ -908,7 +916,8 @@ P_WorldEffects(void)
{ {
if ((current_player->health > 0) && if ((current_player->health > 0) &&
(current_player->pain_debounce_time <= level.time) && (current_player->pain_debounce_time <= level.time) &&
(current_client->invincible_framenum < level.framenum)) (current_client->invincible_framenum < level.framenum) &&
!(current_player->flags & FL_GODMODE))
{ {
if (rand() & 1) if (rand() & 1)
{ {
@ -1033,6 +1042,11 @@ G_SetClientEvent(edict_t *ent)
return; return;
} }
if (ent->health <= 0)
{
return;
}
if (g_footsteps->value == 1) if (g_footsteps->value == 1)
{ {
if (ent->groundentity && (xyspeed > 225)) if (ent->groundentity && (xyspeed > 225))
@ -1043,7 +1057,7 @@ G_SetClientEvent(edict_t *ent)
} }
} }
} }
if (g_footsteps->value == 2) else if (g_footsteps->value == 2)
{ {
if ((int)(current_client->bobtime + bobmove) != bobcycle) if ((int)(current_client->bobtime + bobmove) != bobcycle)
{ {