mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'margin-boost-announcer-call' into 'master'
Add Announcer Call for Margin Boost See merge request kart-krew-dev/ring-racers-internal!2796
This commit is contained in:
commit
3ed778870c
3 changed files with 21 additions and 1 deletions
16
src/k_kart.c
16
src/k_kart.c
|
|
@ -4690,6 +4690,15 @@ void K_CheckpointCrossAward(player_t *player)
|
|||
else
|
||||
{
|
||||
K_AddMessage("Margin Boost!", true, false);
|
||||
S_StartSound(NULL, sfx_duelmb); // Duel announcer call, we only do this on the first margin boost
|
||||
|
||||
// fade out the song for a bit
|
||||
g_musicfade.start = leveltime;
|
||||
g_musicfade.end = g_musicfade.start + 70;
|
||||
g_musicfade.fade = 6;
|
||||
g_musicfade.ticked = false;
|
||||
|
||||
// epic lighting
|
||||
g_darkness.start = leveltime;
|
||||
g_darkness.end = INT32_MAX;
|
||||
for (UINT8 i = 0; i < MAXSPLITSCREENPLAYERS; i++)
|
||||
|
|
@ -4698,7 +4707,12 @@ void K_CheckpointCrossAward(player_t *player)
|
|||
}
|
||||
}
|
||||
|
||||
S_StartSound(NULL, sfx_gsha6);
|
||||
player_t *foeplayer = K_DuelOpponent(player);
|
||||
|
||||
if (!(player->duelscore - foeplayer->duelscore == DUELWINNINGSCORE)) // Avoid playing margin boost sfx when someone wins
|
||||
{
|
||||
S_StartSound(NULL, sfx_gsha6); // Gunstar chk-ching noise
|
||||
}
|
||||
}
|
||||
|
||||
player_t *opp = K_DuelOpponent(player);
|
||||
|
|
|
|||
|
|
@ -1284,6 +1284,9 @@ sfxinfo_t S_sfx[NUMSFX] =
|
|||
{"bpwrue", false, 255, 16, -1, NULL, 0, -1, -1, LUMPERROR, "Super Flicky"},
|
||||
{"bpwruf", false, 255, 16, -1, NULL, 0, -1, -1, LUMPERROR, "Bonus"},
|
||||
|
||||
// Misc announcer calls
|
||||
{"duelmb", false, 255, 16, -1, NULL, 0, -1, -1, LUMPERROR, "Margin Boost"},
|
||||
|
||||
// SRB2Kart - Engine sounds
|
||||
// Engine class A
|
||||
{"krta00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||
|
|
|
|||
|
|
@ -1360,6 +1360,9 @@ typedef enum
|
|||
sfx_bpwrue, // Super Flicky
|
||||
sfx_bpwruf, // Bonus
|
||||
|
||||
// Misc announcer calls
|
||||
sfx_duelmb, // Margin Boost
|
||||
|
||||
// Next up: UNIQUE ENGINE SOUNDS! Hoooooo boy...
|
||||
// Engine class A - Low Speed, Low Weight
|
||||
sfx_krta00,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue