From 98598509251479a5abae162261f36d627b8bf172 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 28 Jan 2023 22:35:24 +1000 Subject: [PATCH] Achievements: Make sound effects not contingent on notifications --- src/duckstation-qt/achievementsettingswidget.cpp | 3 +-- src/frontend-common/achievements.cpp | 12 +++++------- src/frontend-common/fullscreen_ui.cpp | 3 +-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/duckstation-qt/achievementsettingswidget.cpp b/src/duckstation-qt/achievementsettingswidget.cpp index baff3542fb..0f8a534084 100644 --- a/src/duckstation-qt/achievementsettingswidget.cpp +++ b/src/duckstation-qt/achievementsettingswidget.cpp @@ -100,7 +100,6 @@ void AchievementSettingsWidget::updateEnableState() { const bool enabled = m_dialog->getEffectiveBoolValue("Cheevos", "Enabled", false); const bool challenge = m_dialog->getEffectiveBoolValue("Cheevos", "ChallengeMode", false); - const bool notifications = m_dialog->getEffectiveBoolValue("Cheevos", "Notifications", true); m_ui.testMode->setEnabled(enabled); m_ui.useFirstDiscFromPlaylist->setEnabled(enabled); m_ui.richPresence->setEnabled(enabled); @@ -108,7 +107,7 @@ void AchievementSettingsWidget::updateEnableState() m_ui.leaderboards->setEnabled(enabled && challenge); m_ui.unofficialTestMode->setEnabled(enabled); m_ui.notifications->setEnabled(enabled); - m_ui.soundEffects->setEnabled(enabled && notifications); + m_ui.soundEffects->setEnabled(enabled); m_ui.primedIndicators->setEnabled(enabled); } diff --git a/src/frontend-common/achievements.cpp b/src/frontend-common/achievements.cpp index 4c8cc073d4..75a9475d97 100644 --- a/src/frontend-common/achievements.cpp +++ b/src/frontend-common/achievements.cpp @@ -1024,13 +1024,11 @@ void Achievements::DisplayAchievementSummary() Host::RunOnCPUThread([title = std::move(title), summary = std::move(summary), icon = s_game_icon]() { if (FullscreenUI::IsInitialized() && g_settings.achievements_notifications) - { ImGuiFullscreen::AddNotification(10.0f, std::move(title), std::move(summary), std::move(icon)); - // Technically not going through the resource API, but since we're passing this to something else, we can't. - if (g_settings.achievements_sound_effects) - FrontendCommon::PlaySoundAsync(Path::Combine(EmuFolders::Resources, INFO_SOUND_NAME).c_str()); - } + // Technically not going through the resource API, but since we're passing this to something else, we can't. + if (g_settings.achievements_sound_effects) + FrontendCommon::PlaySoundAsync(Path::Combine(EmuFolders::Resources, INFO_SOUND_NAME).c_str()); }); } @@ -1821,9 +1819,9 @@ void Achievements::UnlockAchievement(u32 achievement_id, bool add_notification / ImGuiFullscreen::AddNotification(15.0f, std::move(title), achievement->description, GetAchievementBadgePath(*achievement)); - if (g_settings.achievements_sound_effects) - FrontendCommon::PlaySoundAsync(Path::Combine(EmuFolders::Resources, UNLOCK_SOUND_NAME).c_str()); } + if (g_settings.achievements_sound_effects) + FrontendCommon::PlaySoundAsync(Path::Combine(EmuFolders::Resources, UNLOCK_SOUND_NAME).c_str()); if (IsMastered()) DisplayMasteredNotification(); diff --git a/src/frontend-common/fullscreen_ui.cpp b/src/frontend-common/fullscreen_ui.cpp index 4edceb0a12..09db22ba11 100644 --- a/src/frontend-common/fullscreen_ui.cpp +++ b/src/frontend-common/fullscreen_ui.cpp @@ -4278,7 +4278,6 @@ void FullscreenUI::DrawAchievementsSettingsPage() const bool enabled = bsi->GetBoolValue("Cheevos", "Enabled", false); const bool challenge = bsi->GetBoolValue("Cheevos", "ChallengeMode", false); - const bool notifications = bsi->GetBoolValue("Cheevos", "Notifications", true); DrawToggleSetting(bsi, ICON_FA_USER_FRIENDS " Rich Presence", "When enabled, rich presence information will be collected and sent to the server where supported.", @@ -4299,7 +4298,7 @@ void FullscreenUI::DrawAchievementsSettingsPage() "Cheevos", "Notifications", true, enabled); DrawToggleSetting(bsi, ICON_FA_HEADPHONES " Enable Sound Effects", "Plays sound effects for events such as achievement unlocks and leaderboard submissions.", - "Cheevos", "SoundEffects", true, enabled && notifications); + "Cheevos", "SoundEffects", true, enabled); DrawToggleSetting( bsi, ICON_FA_MAGIC " Show Challenge Indicators", "Shows icons in the lower-right corner of the screen when a challenge/primed achievement is active.", "Cheevos",