stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore old sound effect

Browse source
This commit is contained in:
Jaime Passos 2019-11-17 21:33:59 -03:00
parent 64939816fb
commit 635e121bfc
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/info.c
View file

@ -18909,7 +18909,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_FIREBALL, // spawnstate S_FIREBALL, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_fbll, // seesound sfx_None, // seesound
8, // reactiontime 8, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate
@ -18919,7 +18919,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // missilestate S_NULL, // missilestate
S_NULL, // deathstate S_NULL, // deathstate
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_fblldi, // deathsound sfx_None, // deathsound
40*FRACUNIT, // speed 40*FRACUNIT, // speed
4*FRACUNIT, // radius 4*FRACUNIT, // radius
8*FRACUNIT, // height 8*FRACUNIT, // height

1
src/p_user.c
View file

@ -3998,6 +3998,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
player->pflags |= PF_ATTACKDOWN; player->pflags |= PF_ATTACKDOWN;
mo = P_SpawnPlayerMissile(player->mo, MT_FIREBALL, 0); mo = P_SpawnPlayerMissile(player->mo, MT_FIREBALL, 0);
P_InstaThrust(mo, player->mo->angle, ((mo->info->speed>>FRACBITS)*player->mo->scale) + player->speed); 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 P_SetWeaponDelay(player, TICRATE); // Short delay between fireballs so you can't spam them everywhere
return; return;
} }

2
src/sounds.c
View file

@ -277,8 +277,6 @@ sfxinfo_t S_sfx[NUMSFX] =
{"mario9", true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Emerging power-up"}, {"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"}, {"marioa", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "One-up"},
{"thwomp", true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Thwomp"}, {"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 // Black Eggman
{"bebomb", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"}, {"bebomb", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"},

2
src/sounds.h
View file

@ -326,8 +326,6 @@ typedef enum
sfx_mario9, sfx_mario9,
sfx_marioa, sfx_marioa,
sfx_thwomp, sfx_thwomp,
sfx_fbll,
sfx_fblldi,
// Black Eggman // Black Eggman
sfx_bebomb, sfx_bebomb,