Make Settings Menu Better Behaved Around HitSounds

Deaod · Apr 17, 2024 · 40c32c7 · 40c32c7
1 parent 53b170e
commit 40c32c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Classes/ClientSettings.uc b/Classes/ClientSettings.uc
@@ -171,7 +171,7 @@ simulated function LoadHitSounds() {
 	local int i;
 
 	for (i = 0; i < arraycount(sHitSound); i++) {
-		if (sHitSound[i] != "")
+		if (sHitSound[i] != "" && (sHitSound[i] ~= "none") == false)
 			LoadedHitSound[i] = Sound(DynamicLoadObject(sHitSound[i], class'Sound', true));
 		else
 			LoadedHitSound[i] = none;

diff --git a/Classes/IGPlus_SettingsContent.uc b/Classes/IGPlus_SettingsContent.uc
@@ -697,7 +697,7 @@ function SetUpHitSoundComboBox(IGPlus_ComboBox Cmb) {
 	Cmb.EditBox.bDelayedNotify = true;
 	Cmb.Clear();
 	for (i = 0; i < arraycount(Settings.sHitSound); ++i)
-		Cmb.AddItem(Settings.sHitSound[i], string(i));
+		Cmb.AddItem(string(Settings.LoadedHitSound[i]), string(i));
 }
 
 function SetUpHitSourceComboBox(IGPlus_ComboBox Cmb) {