From 635e121bfcd9740e0f01449295413788d53234cb Mon Sep 17 00:00:00 2001 From: Jaime Passos Date: Sun, 17 Nov 2019 21:33:59 -0300 Subject: [PATCH] Restore old sound effect --- src/info.c | 4 ++-- src/p_user.c | 1 + src/sounds.c | 2 -- src/sounds.h | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/info.c b/src/info.c index 3acdf2e47..50980a9c3 100644 --- a/src/info.c +++ b/src/info.c @@ -18909,7 +18909,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_FIREBALL, // spawnstate 1000, // spawnhealth S_NULL, // seestate - sfx_fbll, // seesound + sfx_None, // seesound 8, // reactiontime sfx_None, // attacksound S_NULL, // painstate @@ -18919,7 +18919,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // missilestate S_NULL, // deathstate S_NULL, // xdeathstate - sfx_fblldi, // deathsound + sfx_None, // deathsound 40*FRACUNIT, // speed 4*FRACUNIT, // radius 8*FRACUNIT, // height diff --git a/src/p_user.c b/src/p_user.c index 9f85c5905..ffcf1e074 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3998,6 +3998,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd) player->pflags |= PF_ATTACKDOWN; mo = P_SpawnPlayerMissile(player->mo, MT_FIREBALL, 0); P_InstaThrust(mo, player->mo->angle, ((mo->info->speed>>FRACBITS)*player->mo->scale) + player->speed); + S_StartSound(player->mo, sfx_mario7); P_SetWeaponDelay(player, TICRATE); // Short delay between fireballs so you can't spam them everywhere return; } diff --git a/src/sounds.c b/src/sounds.c index 4fa2089a5..b067903b1 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -277,8 +277,6 @@ sfxinfo_t S_sfx[NUMSFX] = {"mario9", true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Emerging power-up"}, {"marioa", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "One-up"}, {"thwomp", true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Thwomp"}, - {"fbll", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fireball throw"}, - {"fblldi", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fireball hit"}, // Black Eggman {"bebomb", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"}, diff --git a/src/sounds.h b/src/sounds.h index 7859dfb18..d48deb540 100644 --- a/src/sounds.h +++ b/src/sounds.h @@ -326,8 +326,6 @@ typedef enum sfx_mario9, sfx_marioa, sfx_thwomp, - sfx_fbll, - sfx_fblldi, // Black Eggman sfx_bebomb,