bugfix: stop lobby music played by tgui panel (ss220-space#5803)

WolfLox · Aug 24, 2024 · 59b2a65 · 59b2a65
1 parent 2733897
commit 59b2a65
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
@@ -61,7 +61,8 @@
 	for(var/mob/M in GLOB.player_list)
 		if(M.client.prefs.sound & SOUND_MIDI)
 			if(isnewplayer(M) && (M.client.prefs.sound & SOUND_LOBBY))
-				M.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+				// M.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+				M.client?.tgui_panel?.stop_music()
 			music.volume = 100 * M.client.prefs.get_channel_volume(CHANNEL_ADMIN)
 			SEND_SOUND(M, music)
 

diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
@@ -30,7 +30,8 @@ GLOBAL_LIST_EMPTY(sounds_cache)
 	for(var/mob/M in GLOB.player_list)
 		if(M.client.prefs.sound & SOUND_MIDI)
 			if(isnewplayer(M) && (M.client.prefs.sound & SOUND_LOBBY))
-				M.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+				// M.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+				M.client?.tgui_panel?.stop_music()
 			uploaded_sound.volume = 100 * M.client.prefs.get_channel_volume(CHANNEL_ADMIN)
 			SEND_SOUND(M, uploaded_sound)
 

diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
@@ -2503,7 +2503,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 					if((sound & SOUND_LOBBY) && user.client)
 						user.client.playtitlemusic()
 					else
-						user.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+						// user.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+						user.client?.tgui_panel?.stop_music()
 
 				if("ghost_ears")
 					toggles ^= PREFTOGGLE_CHAT_GHOSTEARS

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
@@ -195,7 +195,8 @@
 			var/mob/dead/observer/observer = new()
 			src << browse(null, "window=playersetup")
 			spawning = 1
-			stop_sound_channel(CHANNEL_LOBBYMUSIC)
+			// stop_sound_channel(CHANNEL_LOBBYMUSIC)
+			client?.tgui_panel?.stop_music()
 
 
 			observer.started_as_observer = 1
@@ -628,7 +629,8 @@
 		client.prefs.real_name = random_name(client.prefs.gender)
 	client.prefs.copy_to(new_character)
 
-	stop_sound_channel(CHANNEL_LOBBYMUSIC)
+	// stop_sound_channel(CHANNEL_LOBBYMUSIC)
+	client?.tgui_panel?.stop_music()
 
 
 	if(mind)

diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
@@ -28,7 +28,8 @@
 
 /mob/proc/AIize()
 	if(client)
-		stop_sound_channel(CHANNEL_LOBBYMUSIC)
+		// stop_sound_channel(CHANNEL_LOBBYMUSIC)
+		client?.tgui_panel?.stop_music()
 
 	var/mob/living/silicon/ai/O = new (loc,,,1)//No MMI but safety is in effect.
 	O.invisibility = 0