From eebe84681f73d91f0f641b817b9dce7abb785576 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 20:16:25 -0700 Subject: [PATCH] sync --- code/game/sound.dm | 5 +++-- code/game/sound.dm.rej | 9 --------- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 code/game/sound.dm.rej diff --git a/code/game/sound.dm b/code/game/sound.dm index 86fdceb3c3..a7db2439b0 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -97,11 +97,12 @@ /mob/proc/stop_sound_channel(chan) SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = chan)) -/client/proc/playtitlemusic() +/client/proc/playtitlemusic(vol = 85) + set waitfor = FALSE UNTIL(SSticker.login_music) //wait for SSticker init to set the login music if(prefs && (prefs.toggles & SOUND_LOBBY)) - SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = 85, channel = CHANNEL_LOBBYMUSIC) // MAD JAMS) + SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = vol, channel = CHANNEL_LOBBYMUSIC) // MAD JAMS) /proc/get_rand_frequency() return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs. diff --git a/code/game/sound.dm.rej b/code/game/sound.dm.rej deleted file mode 100644 index 007e3e17b5..0000000000 --- a/code/game/sound.dm.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/code/game/sound.dm b/code/game/sound.dm (rejected hunks) -@@ -98,6 +98,7 @@ - SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = chan)) - - /client/proc/playtitlemusic(vol = 85) -+ set waitfor = FALSE - UNTIL(SSticker.login_music) //wait for SSticker init to set the login music - - if(prefs && (prefs.toggles & SOUND_LOBBY))