more test...

DopplerShift13 · Oct 19, 2024 · 2fd769d · 2fd769d
1 parent 293a138
commit 2fd769d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/code/game/sound.dm b/code/game/sound.dm
@@ -198,7 +198,7 @@
 ///BEGIN DOPPLER EDIT - VOLUME MIXER
 ///	if(prefs && (prefs.read_preference(/datum/preference/toggle/sound_lobby)) && !CONFIG_GET(flag/disallow_title_music))
 ///		SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = vol, channel = CHANNEL_LOBBYMUSIC)) // MAD JAMS
-	var/volume_modifier = prefs.read_preference(/datum/preference/numeric/sound_lobby_volume)
+	var/volume_modifier = prefs.read_preference(/datum/preference/numeric/sound_lobby)
 	if((prefs && volume_modifier) && !CONFIG_GET(flag/disallow_title_music))
 		SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = volume_modifier, channel = CHANNEL_LOBBYMUSIC)) // MAD JAMS
 ///END DOPPLER EDIT

diff --git a/code/modules/client/preferences/migrations/legacy_sound_toggles_migration.dm b/code/modules/client/preferences/migrations/legacy_sound_toggles_migration.dm
@@ -12,7 +12,7 @@
 	write_preference(GLOB.preference_entries[/datum/preference/toggle/sound_endofround], toggles & 1<<20)
 	write_preference(GLOB.preference_entries[/datum/preference/toggle/sound_instruments], toggles & 1<<7)
 ///	write_preference(GLOB.preference_entries[/datum/preference/toggle/sound_lobby], toggles & 1<<3)
-	write_preference(GLOB.preference_entries[/datum/preference/numeric/sound_lobby_volume], toggles & 1<<3)
+	write_preference(GLOB.preference_entries[/datum/preference/numeric/sound_lobby], toggles & 1<<3)
 	write_preference(GLOB.preference_entries[/datum/preference/toggle/sound_midi], toggles & 1<<1)
 ///	write_preference(GLOB.preference_entries[/datum/preference/toggle/sound_ship_ambience], toggles & 1<<8)
 	write_preference(GLOB.preference_entries[/datum/preference/numeric/sound_ship_ambience_volume], toggles & 1<<8)

diff --git a/code/modules/client/preferences/migrations/sound_checkboxes_migration.dm b/code/modules/client/preferences/migrations/sound_checkboxes_migration.dm
@@ -17,6 +17,6 @@
 	write_preference(GLOB.preference_entries[/datum/preference/numeric/sound_ambience_volume], ambience_pref*100)
 	write_preference(GLOB.preference_entries[/datum/preference/numeric/sound_announcements], announcement_pref*100)
 	write_preference(GLOB.preference_entries[/datum/preference/numeric/sound_ship_ambience_volume], ship_ambience_pref*100)
-	write_preference(GLOB.preference_entries[/datum/preference/numeric/sound_lobby_volume], lobby_music_pref*100)
+	write_preference(GLOB.preference_entries[/datum/preference/numeric/sound_lobby], lobby_music_pref*100)
 	write_preference(GLOB.preference_entries[/datum/preference/numeric/sound_radio_noise], radio_noise_pref*100)
 	return
diff --git a/code/modules/client/preferences/sounds.dm b/code/modules/client/preferences/sounds.dm
@@ -107,16 +107,15 @@
 /// Controls hearing lobby music
 ///BEGIN DOPPLER EDIT - VOLUME MIXER
 ////datum/preference/toggle/sound_lobby
-/datum/preference/numeric/sound_lobby_volume
+/datum/preference/numeric/sound_lobby
 	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
-///	savefile_key = "sound_lobby"
-	savefile_key = "sound_lobby_volume"
+	savefile_key = "sound_lobby"
 	savefile_identifier = PREFERENCE_PLAYER
 	minimum = 0
 	maximum = 200
 
 /// default value is max/2 because 100 1x modifier, while 200 is 2x
-/datum/preference/numeric/sound_lobby_volume/create_default_value()
+/datum/preference/numeric/sound_lobby/create_default_value()
 	return maximum/2
 
 ////datum/preference/toggle/sound_lobby/apply_to_client_updated(client/client, value)