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

S_SoundTestPlay: Improvements

Browse source 
- Tidy conditionals
    - Fixes dosequencefadeout potentially not being set for this particular track.
- Only functionally loop the song if the duration before looping is less than 3 minutes.
    - Ensures particularly long songs that already do minor variations of the same loop don't overstay their welcome.
This commit is contained in:
toaster 2023-04-03 20:04:53 +01:00
parent 9540cd7c88
commit 37c1a40da6
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/s_sound.c
View file

@ -1622,20 +1622,25 @@ void S_SoundTestPlay(void)
soundtest.currenttime = 0;
soundtest.sequencemaxtime = S_GetMusicLength();
// ensure default is always set
soundtest.sequencefadeout = 0;
soundtest.dosequencefadeout = false;
if (soundtest.sequencemaxtime)
{
// Does song have default loop?
if (soundtest.current->basenoloop[soundtest.currenttrack] == false)
{
if (soundtest.sequencemaxtime < 3*60*1000)
{
// I'd personally like songs in sequence to last between 3 and 6 minutes.
const UINT32 loopduration = (soundtest.sequencemaxtime - S_GetMusicLoopPoint());
soundtest.sequencemaxtime += loopduration;
}
// Only fade out if we're the last track for this song.
soundtest.dosequencefadeout = (soundtest.currenttrack == soundtest.current->numtracks-1);
soundtest.sequencemaxtime *= 2; // Two loops by default.
soundtest.sequencemaxtime -= S_GetMusicLoopPoint(); // Otherwise the intro is counted twice.
}
else
{
soundtest.dosequencefadeout = false;
}
// ms to TICRATE conversion