diff --git a/Source/inv.cpp b/Source/inv.cpp index b21ec3621..60b14a706 100644 --- a/Source/inv.cpp +++ b/Source/inv.cpp @@ -327,7 +327,7 @@ bool AutoEquip(int playerId, const Item &item, inv_body_loc bodyLocation, bool p if (persistItem) { player.InvBody[bodyLocation] = item; - if (sgOptions.Audio.bAutoEquipSound && playerId == MyPlayerId) { + if (*sgOptions.Audio.autoEquipSound && playerId == MyPlayerId) { PlaySFX(ItemInvSnds[ItemCAnimTbl[item._iCurs]]); } diff --git a/Source/options.cpp b/Source/options.cpp index d9e0d9ca1..e9e2887a4 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.bAutoEquipSound = GetIniBool("Audio", "Auto Equip Sound", AUTO_PICKUP_DEFAULT(false)); sgOptions.Audio.bItemPickupSound = GetIniBool("Audio", "Item Pickup Sound", AUTO_PICKUP_DEFAULT(false)); sgOptions.Audio.nSampleRate = GetIniInt("Audio", "Sample Rate", DEFAULT_AUDIO_SAMPLE_RATE); @@ -395,7 +394,6 @@ void SaveOptions() SetIniValue("Audio", "Sound Volume", sgOptions.Audio.nSoundVolume); SetIniValue("Audio", "Music Volume", sgOptions.Audio.nMusicVolume); - SetIniValue("Audio", "Auto Equip Sound", sgOptions.Audio.bAutoEquipSound); SetIniValue("Audio", "Item Pickup Sound", sgOptions.Audio.bItemPickupSound); SetIniValue("Audio", "Sample Rate", sgOptions.Audio.nSampleRate); @@ -604,12 +602,14 @@ std::vector HellfireOptions::GetEntries() 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)) { } std::vector AudioOptions::GetEntries() { return { &walkingSound, + &autoEquipSound, }; } diff --git a/Source/options.h b/Source/options.h index 6ed1de6c3..a00c1e658 100644 --- a/Source/options.h +++ b/Source/options.h @@ -205,7 +205,7 @@ struct AudioOptions : OptionCategoryBase { /** @brief Player emits sound when walking. */ OptionEntryBoolean walkingSound; /** @brief Automatically equipping items on pickup emits the equipment sound. */ - bool bAutoEquipSound; + OptionEntryBoolean autoEquipSound; /** @brief Picking up items emits the items pickup sound. */ bool bItemPickupSound;