From 39fa4fea4abae574296423379fc0148779f20832 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Tue, 18 Apr 2017 15:57:52 +0100 Subject: [PATCH] * Update some sound names. * Make the continue and the flag capture use different sound numbers. * Make the fancy new race countdown go beep. --- src/p_user.c | 4 ++-- src/sounds.c | 8 ++++---- src/st_stuff.c | 8 ++++++++ src/y_inter.c | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 7062ebee4..67adcdce2 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1030,7 +1030,7 @@ void P_AddPlayerScore(player_t *player, UINT32 amount) players[i].continues += 1; players[i].gotcontinue = true; if (P_IsLocalPlayer(player)) - S_StartSound(NULL, sfx_flgcap); + S_StartSound(NULL, sfx_s3kac); } */ } } @@ -1050,7 +1050,7 @@ void P_AddPlayerScore(player_t *player, UINT32 amount) player->continues += 1; player->gotcontinue = true; if (P_IsLocalPlayer(player)) - S_StartSound(NULL, sfx_flgcap); + S_StartSound(NULL, sfx_s3kac); } } diff --git a/src/sounds.c b/src/sounds.c index 792e3650e..d9c65b603 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -64,7 +64,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"alarm", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Alarm"}, {"buzz1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric zap"}, {"buzz2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric zap"}, - {"buzz3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric zap"}, + {"buzz3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wacky worksurface"}, {"buzz4", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Buzz"}, {"crumbl", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crumbling"}, // Platform Crumble Tails 03-16-2001 {"fire", false, 8, 32, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, @@ -137,7 +137,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"appear", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Appearing platform"}, {"bkpoof", false, 70, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Armageddon explosion"}, {"bnce1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"}, // Boing! - {"bnce2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ricochet"}, // Boing! + {"bnce2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Scatter"}, // Boing! {"cannon", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful shot"}, {"cgot" , true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Chaos Emerald"}, // Got Emerald! Tails 09-02-2001 {"cybdth", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"}, @@ -196,7 +196,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"chchng", false, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Score tally done"}, {"dwnind", false, 212, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Thinking about air"}, {"emfind", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Radar beep"}, - {"flgcap", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flag capture"}, + {"flgcap", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flag captured"}, {"menu1", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Menu beep"}, {"oneup", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Extra life"}, {"ptally", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Score tally"}, // Point tally is identical to menu for now @@ -223,7 +223,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"hoop2", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop+"}, {"hoop3", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop++"}, {"hidden", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Discovery"}, - {"prloop", false, 104, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Paraloop"}, + {"prloop", false, 104, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gust of wind"}, {"timeup", true, 256, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous Countdown"}, // Mario diff --git a/src/st_stuff.c b/src/st_stuff.c index 80d963329..595b9e764 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1495,15 +1495,23 @@ static inline void ST_drawRaceHUD(void) { case 1: racenum = race3; + if (!bounce) + S_StartSound(0, sfx_s3ka7); break; case 2: racenum = race2; + if (!bounce) + S_StartSound(0, sfx_s3ka7); break; case 3: racenum = race1; + if (!bounce) + S_StartSound(0, sfx_s3ka7); break; default: racenum = racego; + if (!bounce) + S_StartSound(0, sfx_s3kad); break; } if (bounce < 3) diff --git a/src/y_inter.c b/src/y_inter.c index ee7755bc9..c730745d5 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -756,7 +756,7 @@ void Y_Ticker(void) if (intertic > tallydonetic) { endtic = intertic + 4*TICRATE; // 4 second pause after end of tally - S_StartSound(NULL, sfx_flgcap); // cha-ching! + S_StartSound(NULL, sfx_s3kac); // cha-ching! } return; }