Achievements: Purge first-disc-from-playlist option

Unnecessary since all disc's hashes are registered.

src/core/achievements.cpp

@@ -955,8 +955,7 @@ void Achievements::IdentifyGame(const std::string& path, CDImage* image)
   }
 
   std::unique_ptr<CDImage> temp_image;
-  if (!path.empty() && (!image || (g_settings.achievements_use_first_disc_from_playlist && image->HasSubImages() &&
+  if (!path.empty() && !image)
-                                   image->GetCurrentSubImage() != 0)))
   {
     temp_image = CDImage::Open(path.c_str(), g_settings.cdrom_load_image_patches, nullptr);
     image = temp_image.get();

src/core/settings.cpp

@@ -416,7 +416,6 @@ void Settings::Load(const SettingsInterface& si, const SettingsInterface& contro
   achievements_encore_mode = si.GetBoolValue("Cheevos", "EncoreMode", false);
   achievements_spectator_mode = si.GetBoolValue("Cheevos", "SpectatorMode", false);
   achievements_unofficial_test_mode = si.GetBoolValue("Cheevos", "UnofficialTestMode", false);
-  achievements_use_first_disc_from_playlist = si.GetBoolValue("Cheevos", "UseFirstDiscFromPlaylist", true);
   achievements_use_raintegration = si.GetBoolValue("Cheevos", "UseRAIntegration", false);
   achievements_notification_duration =
     si.GetIntValue("Cheevos", "NotificationsDuration", DEFAULT_ACHIEVEMENT_NOTIFICATION_TIME);
@@ -678,7 +677,6 @@ void Settings::Save(SettingsInterface& si, bool ignore_base) const
   si.SetBoolValue("Cheevos", "EncoreMode", achievements_encore_mode);
   si.SetBoolValue("Cheevos", "SpectatorMode", achievements_spectator_mode);
   si.SetBoolValue("Cheevos", "UnofficialTestMode", achievements_unofficial_test_mode);
-  si.SetBoolValue("Cheevos", "UseFirstDiscFromPlaylist", achievements_use_first_disc_from_playlist);
   si.SetBoolValue("Cheevos", "UseRAIntegration", achievements_use_raintegration);
   si.SetIntValue("Cheevos", "NotificationsDuration", achievements_notification_duration);
   si.SetIntValue("Cheevos", "LeaderboardsDuration", achievements_leaderboard_duration);

src/core/settings.h

@@ -213,7 +213,6 @@ struct Settings
   bool achievements_encore_mode : 1 = false;
   bool achievements_spectator_mode : 1 = false;
   bool achievements_unofficial_test_mode : 1 = false;
-  bool achievements_use_first_disc_from_playlist : 1 = true;
   bool achievements_use_raintegration : 1 = false;
   s32 achievements_notification_duration = DEFAULT_ACHIEVEMENT_NOTIFICATION_TIME;
   s32 achievements_leaderboard_duration = DEFAULT_LEADERBOARD_NOTIFICATION_TIME;

src/duckstation-qt/achievementsettingswidget.cpp

@@ -34,8 +34,6 @@ AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* dialog, QWi
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.spectatorMode, "Cheevos", "SpectatorMode", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.unofficialAchievements, "Cheevos", "UnofficialTestMode",
                                                false);
-  SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.useFirstDiscFromPlaylist, "Cheevos",
-                                               "UseFirstDiscFromPlaylist", true);
   SettingWidgetBinder::BindWidgetToFloatSetting(sif, m_ui.achievementNotificationsDuration, "Cheevos",
                                                 "NotificationsDuration",
                                                 Settings::DEFAULT_ACHIEVEMENT_NOTIFICATION_TIME);
@@ -68,16 +66,15 @@ AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* dialog, QWi
     m_ui.unofficialAchievements, tr("Test Unofficial Achievements"), tr("Unchecked"),
     tr("When enabled, DuckStation will list achievements from unofficial sets. Please note that these achievements are "
        "not tracked by RetroAchievements, so they unlock every time."));
-  dialog->registerWidgetHelp(
-    m_ui.useFirstDiscFromPlaylist, tr("Use First Disc From Playlist"), tr("Unchecked"),
-    tr(
-      "When enabled, the first disc in a playlist will be used for achievements, regardless of which disc is active."));
 
   connect(m_ui.enable, &QCheckBox::checkStateChanged, this, &AchievementSettingsWidget::updateEnableState);
   connect(m_ui.hardcoreMode, &QCheckBox::checkStateChanged, this, &AchievementSettingsWidget::updateEnableState);
-  connect(m_ui.hardcoreMode, &QCheckBox::checkStateChanged, this, &AchievementSettingsWidget::onHardcoreModeStateChanged);
+  connect(m_ui.hardcoreMode, &QCheckBox::checkStateChanged, this,
-  connect(m_ui.achievementNotifications, &QCheckBox::checkStateChanged, this, &AchievementSettingsWidget::updateEnableState);
+          &AchievementSettingsWidget::onHardcoreModeStateChanged);
-  connect(m_ui.leaderboardNotifications, &QCheckBox::checkStateChanged, this, &AchievementSettingsWidget::updateEnableState);
+  connect(m_ui.achievementNotifications, &QCheckBox::checkStateChanged, this,
+          &AchievementSettingsWidget::updateEnableState);
+  connect(m_ui.leaderboardNotifications, &QCheckBox::checkStateChanged, this,
+          &AchievementSettingsWidget::updateEnableState);
   connect(m_ui.achievementNotificationsDuration, &QSlider::valueChanged, this,
           &AchievementSettingsWidget::onAchievementsNotificationDurationSliderChanged);
   connect(m_ui.leaderboardNotificationsDuration, &QSlider::valueChanged, this,
@@ -128,7 +125,6 @@ void AchievementSettingsWidget::updateEnableState()
   m_ui.encoreMode->setEnabled(enabled);
   m_ui.spectatorMode->setEnabled(enabled);
   m_ui.unofficialAchievements->setEnabled(enabled);
-  m_ui.useFirstDiscFromPlaylist->setEnabled(enabled);
 }
 
 void AchievementSettingsWidget::onHardcoreModeStateChanged()

src/duckstation-qt/achievementsettingswidget.ui

@@ -64,13 +64,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="useFirstDiscFromPlaylist">
-        <property name="text">
-         <string>Use First Disc From Playlist</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -97,13 +90,13 @@
            <number>5</number>
           </property>
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="invertedAppearance">
            <bool>false</bool>
           </property>
           <property name="tickPosition">
-           <enum>QSlider::TicksBelow</enum>
+           <enum>QSlider::TickPosition::TicksBelow</enum>
           </property>
           <property name="tickInterval">
            <number>1</number>
@@ -143,13 +136,13 @@
            <number>5</number>
           </property>
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="invertedAppearance">
            <bool>false</bool>
           </property>
           <property name="tickPosition">
-           <enum>QSlider::TicksBelow</enum>
+           <enum>QSlider::TickPosition::TicksBelow</enum>
           </property>
           <property name="tickInterval">
            <number>1</number>
@@ -202,7 +195,7 @@
 Login token generated at:</string>
         </property>
         <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
         </property>
        </widget>
       </item>
@@ -242,7 +235,7 @@ Login token generated at:</string>
       <item row="0" column="0">
        <widget class="QLabel" name="gameInfo">
         <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
         </property>
        </widget>
       </item>
@@ -252,7 +245,7 @@ Login token generated at:</string>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -265,7 +258,7 @@ Login token generated at:</string>
   </layout>
  </widget>
  <resources>
-  <include location="resources/resources.qrc"/>
+  <include location="resources/duckstation-qt.qrc"/>
  </resources>
  <connections/>
 </ui>