thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'exp-sfx' into 'master'

Browse source 
EXP sounds

See merge request kart-krew-dev/ring-racers-internal!2842
This commit is contained in:
Oni VelocitOni 2025-09-14 21:58:23 +00:00
commit 5e57908b64
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -22753,7 +22753,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // missilestate S_NULL, // missilestate
S_NULL, // deathstate S_NULL, // deathstate
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_exp, // deathsound
1, // speed 1, // speed
32*FRACUNIT, // radius 32*FRACUNIT, // radius
32*FRACUNIT, // height 32*FRACUNIT, // height

5
src/objects/exp.c
View file

@ -85,7 +85,12 @@ void Obj_ExpThink (mobj_t *exp)
exp->extravalue1++; exp->extravalue1++;
if (exp->extravalue1 >= 16) if (exp->extravalue1 >= 16)
{
S_StopSoundByID(exp->target, sfx_exp);
S_StartSound(exp->target, sfx_exp);
P_RemoveMobj(exp); P_RemoveMobj(exp);
}
return; return;
} }

3
src/sounds.c
View file

@ -1266,6 +1266,9 @@ sfxinfo_t S_sfx[NUMSFX] =
{"hint", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hint Ring"}, {"hint", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hint Ring"},
{"exp", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "EXP Crystal"}, // When it gets sucked in
// Damage sounds // Damage sounds
{"dmga1", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"}, {"dmga1", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"},
{"dmga2", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"}, {"dmga2", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"},

3
src/sounds.h
View file

@ -1342,6 +1342,9 @@ typedef enum
// Tutorial Hint // Tutorial Hint
sfx_hint, sfx_hint,
// EXP Crystal
sfx_exp,
// Damage sounds // Damage sounds
sfx_dmga1, sfx_dmga1,
sfx_dmga2, sfx_dmga2,