From cb6d49e69741cbc13c74f2cbbf4271ef6a1ee26b Mon Sep 17 00:00:00 2001
From: obligaron <obligaron@live.com>
Date: Sun, 7 Nov 2021 23:38:15 +0100
Subject: [PATCH] Add OptionEntry Item Pickup Sound

---
 Source/inv.cpp     | 2 +-
 Source/options.cpp | 4 ++--
 Source/options.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/inv.cpp b/Source/inv.cpp
index 60b14a706..e69846342 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -1704,7 +1704,7 @@ void AutoGetItem(int pnum, Item *item, int ii)
 	}
 
 	if (done) {
-		if (!autoEquipped && sgOptions.Audio.bItemPickupSound && pnum == MyPlayerId) {
+		if (!autoEquipped && *sgOptions.Audio.itemPickupSound && pnum == MyPlayerId) {
 			PlaySFX(IS_IGRAB);
 		}
 
diff --git a/Source/options.cpp b/Source/options.cpp
index e9e2887a4..c94588a7c 100644
--- a/Source/options.cpp
+++ b/Source/options.cpp
@@ -232,7 +232,6 @@ void LoadOptions()
 
 	sgOptions.Audio.nSoundVolume = GetIniInt("Audio", "Sound Volume", VOLUME_MAX);
 	sgOptions.Audio.nMusicVolume = GetIniInt("Audio", "Music Volume", VOLUME_MAX);
-	sgOptions.Audio.bItemPickupSound = GetIniBool("Audio", "Item Pickup Sound", AUTO_PICKUP_DEFAULT(false));
 
 	sgOptions.Audio.nSampleRate = GetIniInt("Audio", "Sample Rate", DEFAULT_AUDIO_SAMPLE_RATE);
 	sgOptions.Audio.nChannels = GetIniInt("Audio", "Channels", DEFAULT_AUDIO_CHANNELS);
@@ -394,7 +393,6 @@ void SaveOptions()
 
 	SetIniValue("Audio", "Sound Volume", sgOptions.Audio.nSoundVolume);
 	SetIniValue("Audio", "Music Volume", sgOptions.Audio.nMusicVolume);
-	SetIniValue("Audio", "Item Pickup Sound", sgOptions.Audio.bItemPickupSound);
 
 	SetIniValue("Audio", "Sample Rate", sgOptions.Audio.nSampleRate);
 	SetIniValue("Audio", "Channels", sgOptions.Audio.nChannels);
@@ -603,6 +601,7 @@ AudioOptions::AudioOptions()
     : OptionCategoryBase("Audio", N_("Audio"), N_("Audio Settings"))
     , walkingSound("Walking Sound", OptionEntryFlags::None, N_("Walking Sound"), N_("Player emits sound when walking."), true)
     , autoEquipSound("Auto Equip Sound", OptionEntryFlags::None, N_("Auto Equip Sound"), N_("Automatically equipping items on pickup emits the equipment sound."), AUTO_PICKUP_DEFAULT(false))
+    , itemPickupSound("Item Pickup Sound", OptionEntryFlags::None, N_("Item Pickup Sound"), N_("Picking up items emits the items pickup sound."), AUTO_PICKUP_DEFAULT(false))
 {
 }
 std::vector<OptionEntryBase *> AudioOptions::GetEntries()
@@ -610,6 +609,7 @@ std::vector<OptionEntryBase *> AudioOptions::GetEntries()
 	return {
 		&walkingSound,
 		&autoEquipSound,
+		&itemPickupSound,
 	};
 }
 
diff --git a/Source/options.h b/Source/options.h
index a00c1e658..467b836d4 100644
--- a/Source/options.h
+++ b/Source/options.h
@@ -207,7 +207,7 @@ struct AudioOptions : OptionCategoryBase {
 	/** @brief Automatically equipping items on pickup emits the equipment sound. */
 	OptionEntryBoolean autoEquipSound;
 	/** @brief Picking up items emits the items pickup sound. */
-	bool bItemPickupSound;
+	OptionEntryBoolean itemPickupSound;
 
 	/** @brief Output sample rate (Hz) */
 	std::uint32_t nSampleRate;