stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-03-31 07:21:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Re-enable kartvoices controls for K_PlayTauntSound and K_PlayOvertakeSound.

Browse source 
* Make the three P_Play<?>Sounds from p_local.h actual functions that acknowledge the kartvoices cvar.
This commit is contained in:
toaster 2018-07-29 23:51:08 +01:00
parent 2907fe8836
commit 65a956259b
3 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_kart.c
View file

@ -1339,7 +1339,7 @@ static void K_RegularVoiceTimers(player_t *player)
static void K_PlayTauntSound(mobj_t *source)
{
#if 0
#if 1
sfxenum_t pick = P_RandomKey(4); // Gotta roll the RNG every time this is called for sync reasons
boolean tasteful = (!source->player || !source->player->kartstuff[k_tauntvoices]);
@ -1362,7 +1362,7 @@ static void K_PlayTauntSound(mobj_t *source)
static void K_PlayOvertakeSound(mobj_t *source)
{
#if 0
#if 1
boolean tasteful = (!source->player || !source->player->kartstuff[k_voices]);
if (!G_RaceGametype()) // Only in race

6
src/p_local.h
View file

@ -194,9 +194,9 @@ void P_SpawnSpinMobj(player_t *player, mobjtype_t type);
void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range);
void P_PlayLivesJingle(player_t *player);
#define P_PlayRinglossSound(s) S_StartSound(s, (mariomode) ? sfx_mario8 : sfx_altow1 + P_RandomKey(4));
#define P_PlayDeathSound(s) S_StartSound(s, sfx_altdi1 + P_RandomKey(4));
#define P_PlayVictorySound(s) S_StartSound(s, sfx_victr1 + P_RandomKey(4));
void P_PlayRinglossSound(mobj_t *source);
void P_PlayDeathSound(mobj_t *source);
void P_PlayVictorySound(mobj_t *source);
//

25
src/p_user.c
View file

@ -1118,6 +1118,31 @@ void P_PlayLivesJingle(player_t *player)
}
}
void P_PlayRinglossSound(mobj_t *source)
{
sfxenum_t key = P_RandomKey(4);
if (cv_kartvoices.value)
S_StartSound(source, (mariomode) ? sfx_mario8 : sfx_altow1 + key);
else
S_StartSound(source, sfx_slip);
}
void P_PlayDeathSound(mobj_t *source)
{
sfxenum_t key = P_RandomKey(4);
if (cv_kartvoices.value)
S_StartSound(source, sfx_altdi1 + key);
else
S_StartSound(source, sfx_s3k35);
}
void P_PlayVictorySound(mobj_t *source)
{
sfxenum_t key = P_RandomKey(4);
if (cv_kartvoices.value)
S_StartSound(source, sfx_victr1 + key);
}
//
// P_EndingMusic
//