mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-12-21 15:32:34 +00:00
Seperate out Key Generation and Challenge Achievement sounds
Also removes unused sound effect defintion for sfx_endwrp
This commit is contained in:
parent
6f67984e27
commit
01cb8c0289
5 changed files with 15 additions and 7 deletions
|
|
@ -207,7 +207,7 @@ void K_TimerInit(void)
|
||||||
}
|
}
|
||||||
else if (skipstats != 0 && bossintro == false)
|
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))
|
if ((gametyperules & (GTR_CATCHER|GTR_CIRCUIT)) == (GTR_CATCHER|GTR_CIRCUIT))
|
||||||
|
|
|
||||||
12
src/m_cond.c
12
src/m_cond.c
|
|
@ -3113,8 +3113,6 @@ boolean M_UpdateUnlockablesAndExtraEmblems(boolean loud, boolean doall)
|
||||||
response++;
|
response++;
|
||||||
}
|
}
|
||||||
|
|
||||||
response += newkeys;
|
|
||||||
|
|
||||||
// Announce
|
// Announce
|
||||||
if (response != 0)
|
if (response != 0)
|
||||||
{
|
{
|
||||||
|
|
@ -3124,6 +3122,16 @@ boolean M_UpdateUnlockablesAndExtraEmblems(boolean loud, boolean doall)
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (newkeys != 0)
|
||||||
|
{
|
||||||
|
if (loud)
|
||||||
|
{
|
||||||
|
S_StartSound(NULL, sfx_keygen);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -648,7 +648,7 @@ void M_ChallengesTick(void)
|
||||||
|
|
||||||
if (gamedata->keyspending > 0)
|
if (gamedata->keyspending > 0)
|
||||||
{
|
{
|
||||||
S_StartSound(NULL, sfx_achiev);
|
S_StartSound(NULL, sfx_keygen);
|
||||||
gamedata->keyspending--;
|
gamedata->keyspending--;
|
||||||
gamedata->chaokeys++;
|
gamedata->chaokeys++;
|
||||||
challengesmenu.unlockcount[CMC_CHAOANIM]++;
|
challengesmenu.unlockcount[CMC_CHAOANIM]++;
|
||||||
|
|
|
||||||
|
|
@ -1102,8 +1102,8 @@ sfxinfo_t S_sfx[NUMSFX] =
|
||||||
{"typri2", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SA2 final boss-type typewriting
|
{"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
|
{"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"},
|
{"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"
|
{"keygen", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Key Generated"},
|
||||||
{"endwrp", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // End of a "Tutorial Teleport"
|
{"gpmetr", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
|
|
||||||
// SRB2Kart - Ring Box
|
// SRB2Kart - Ring Box
|
||||||
{"slot00", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bar"},
|
{"slot00", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bar"},
|
||||||
|
|
|
||||||
|
|
@ -1170,8 +1170,8 @@ typedef enum
|
||||||
sfx_typri2,
|
sfx_typri2,
|
||||||
sfx_eggspr,
|
sfx_eggspr,
|
||||||
sfx_achiev,
|
sfx_achiev,
|
||||||
|
sfx_keygen,
|
||||||
sfx_gpmetr,
|
sfx_gpmetr,
|
||||||
sfx_endwrp,
|
|
||||||
|
|
||||||
// SRB2Kart - Ring Box
|
// SRB2Kart - Ring Box
|
||||||
sfx_slot00,
|
sfx_slot00,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue