From 5a703240bd37aa016174cd21a60e415ea7a55e0f Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Fri, 28 Jul 2023 19:33:02 -0700 Subject: [PATCH] Slow down level music in Encore - "vape mode" --- src/p_user.c | 4 ---- src/s_sound.c | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index dc8aee15c..3031eba10 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -873,8 +873,6 @@ skippingposition: if (jingle == NULL) return; - S_SpeedMusic(1.0f); - S_ChangeMusicInternal(jingle, false); } @@ -894,8 +892,6 @@ void P_RestoreMusic(player_t *player) return; } - S_SpeedMusic(1.0f); - // Event - HERE COMES A NEW CHALLENGER if (mapreset) { diff --git a/src/s_sound.c b/src/s_sound.c index ed0e29661..8dd86d6c3 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2801,6 +2801,9 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 I_SetSongPosition(position); I_SetSongTrack(mflags & MUSIC_TRACKMASK); + + // Slow level music down a bit in Encore. (Values are vibe-based. WE GET IT YOU VAPE) + S_SpeedMusic((encoremode && gamestate == GS_LEVEL) ? 0.86471f : 1.f); } else if (fadeinms) // let fades happen with same music { @@ -2833,7 +2836,6 @@ void S_StopMusic(void) if (I_SongPaused()) I_ResumeSong(); - S_SpeedMusic(1.0f); I_StopSong(); S_UnloadMusic(); // for now, stopping also means you unload the song