Seperate out Key Generation and Challenge Achievement sounds

Also removes unused sound effect defintion for sfx_endwrp
This commit is contained in:
toaster 2024-03-26 22:27:07 +00:00
parent 6f67984e27
commit 01cb8c0289
5 changed files with 15 additions and 7 deletions

View file

@ -207,7 +207,7 @@ void K_TimerInit(void)
}
else if (skipstats != 0 && bossintro == false)
{
S_StartSound(NULL, sfx_s26c); //sfx_endwrp
S_StartSound(NULL, sfx_s26c);
}
if ((gametyperules & (GTR_CATCHER|GTR_CIRCUIT)) == (GTR_CATCHER|GTR_CIRCUIT))

View file

@ -3113,8 +3113,6 @@ boolean M_UpdateUnlockablesAndExtraEmblems(boolean loud, boolean doall)
response++;
}
response += newkeys;
// Announce
if (response != 0)
{
@ -3124,6 +3122,16 @@ boolean M_UpdateUnlockablesAndExtraEmblems(boolean loud, boolean doall)
}
return true;
}
if (newkeys != 0)
{
if (loud)
{
S_StartSound(NULL, sfx_keygen);
}
return true;
}
return false;
}

View file

@ -648,7 +648,7 @@ void M_ChallengesTick(void)
if (gamedata->keyspending > 0)
{
S_StartSound(NULL, sfx_achiev);
S_StartSound(NULL, sfx_keygen);
gamedata->keyspending--;
gamedata->chaokeys++;
challengesmenu.unlockcount[CMC_CHAOANIM]++;

View file

@ -1102,8 +1102,8 @@ sfxinfo_t S_sfx[NUMSFX] =
{"typri2", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SA2 final boss-type typewriting
{"eggspr", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Sonic Unleashed Trap Spring
{"achiev", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Achievement"},
{"gpmetr", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // End of a "Tutorial Teleport"
{"endwrp", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // End of a "Tutorial Teleport"
{"keygen", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Key Generated"},
{"gpmetr", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
// SRB2Kart - Ring Box
{"slot00", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bar"},

View file

@ -1170,8 +1170,8 @@ typedef enum
sfx_typri2,
sfx_eggspr,
sfx_achiev,
sfx_keygen,
sfx_gpmetr,
sfx_endwrp,
// SRB2Kart - Ring Box
sfx_slot00,