stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-24 04:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Okay do this correctly by doing a reacharound to grab the actual sfx id

Browse source
This commit is contained in:
TehRealSalt 2018-09-07 16:56:34 -04:00
parent f907a3c215
commit 6317ae5996
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/p_user.c
View file

@ -1730,10 +1730,27 @@ void P_DoPlayerExit(player_t *player)
if (cv_kartvoices.value && P_IsLocalPlayer(player)) if (cv_kartvoices.value && P_IsLocalPlayer(player))
{ {
if (K_IsPlayerLosing(player)) if (P_IsLocalPlayer(player))
S_StartSound(player->mo, sfx_klose); {
sfxenum_t sfx_id;
if (K_IsPlayerLosing(player))
{
sfx_id = ((skin_t *)player->mo->skin)->soundsid[S_sfx[sfx_klose].skinsound];
S_StartSound(NULL, sfx_id);
}
else
{
sfx_id = ((skin_t *)player->mo->skin)->soundsid[S_sfx[sfx_kwin].skinsound];
S_StartSound(NULL, sfx_id);
}
}
else else
S_StartSound(player->mo, sfx_kwin); {
if (K_IsPlayerLosing(player))
S_StartSound(player->mo, sfx_klose);
else
S_StartSound(player->mo, sfx_kwin);
}
} }
player->exiting = 3*TICRATE; player->exiting = 3*TICRATE;

4
src/sounds.c
View file

@ -814,8 +814,8 @@ sfxinfo_t S_sfx[NUMSFX] =
{"dbgsal", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"dbgsal", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
// SRB2kart - Skin sounds // SRB2kart - Skin sounds
{"kwin", false, 64, 48, -1, NULL, 0, SKSKWIN, -1, LUMPERROR}, {"kwin", false, 64, 96, -1, NULL, 0, SKSKWIN, -1, LUMPERROR},
{"klose", false, 64, 48, -1, NULL, 0, SKSKLOSE, -1, LUMPERROR}, {"klose", false, 64, 96, -1, NULL, 0, SKSKLOSE, -1, LUMPERROR},
{"khurt1", false, 64, 96, -1, NULL, 0, SKSKPAN1, -1, LUMPERROR}, {"khurt1", false, 64, 96, -1, NULL, 0, SKSKPAN1, -1, LUMPERROR},
{"khurt2", false, 64, 96, -1, NULL, 0, SKSKPAN2, -1, LUMPERROR}, {"khurt2", false, 64, 96, -1, NULL, 0, SKSKPAN2, -1, LUMPERROR},
{"kattk1", false, 64, 96, -1, NULL, 0, SKSKATK1, -1, LUMPERROR}, {"kattk1", false, 64, 96, -1, NULL, 0, SKSKATK1, -1, LUMPERROR},