From 9eb2ef88eedc5a8bc65ee7d060af4bd84ebd63aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= <capelle.mikael@gmail.com>
Date: Sat, 22 Jun 2024 08:29:47 +0200
Subject: [PATCH] Update following gamebryo updates for myGamesPath() in game
 feature. (#30)

---
 src/game_skyrim_en.ts      | 4 ++--
 src/gameskyrim.cpp         | 5 ++---
 src/skyrimdataarchives.cpp | 8 ++------
 src/skyrimdataarchives.h   | 4 +---
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/game_skyrim_en.ts b/src/game_skyrim_en.ts
index df22473..1ba702c 100644
--- a/src/game_skyrim_en.ts
+++ b/src/game_skyrim_en.ts
@@ -4,12 +4,12 @@
 <context>
     <name>GameSkyrim</name>
     <message>
-        <location filename="gameskyrim.cpp" line="90"/>
+        <location filename="gameskyrim.cpp" line="92"/>
         <source>Skyrim Support Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="gameskyrim.cpp" line="100"/>
+        <location filename="gameskyrim.cpp" line="102"/>
         <source>Adds support for the game Skyrim</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/gameskyrim.cpp b/src/gameskyrim.cpp
index 0a9b381..4f221f3 100644
--- a/src/gameskyrim.cpp
+++ b/src/gameskyrim.cpp
@@ -41,13 +41,12 @@ bool GameSkyrim::init(IOrganizer* moInfo)
     return false;
   }
 
-  auto dataArchives = std::make_shared<SkyrimDataArchives>(myGamesPath());
+  auto dataArchives = std::make_shared<SkyrimDataArchives>(this);
   registerFeature(std::make_shared<SkyrimScriptExtender>(this));
   registerFeature(dataArchives);
   registerFeature(std::make_shared<SkyrimBSAInvalidation>(dataArchives.get(), this));
   registerFeature(std::make_shared<GamebryoSaveGameInfo>(this));
-  registerFeature(
-      std::make_shared<GamebryoLocalSavegames>(myGamesPath(), "skyrim.ini"));
+  registerFeature(std::make_shared<GamebryoLocalSavegames>(this, "skyrim.ini"));
   registerFeature(std::make_shared<SkyrimModDataChecker>(this));
   registerFeature(std::make_shared<SkyrimModDataContent>(m_Organizer->gameFeatures()));
   registerFeature(std::make_shared<SkyrimGamePlugins>(moInfo));
diff --git a/src/skyrimdataarchives.cpp b/src/skyrimdataarchives.cpp
index 3855167..6422175 100644
--- a/src/skyrimdataarchives.cpp
+++ b/src/skyrimdataarchives.cpp
@@ -1,10 +1,6 @@
 #include "skyrimdataarchives.h"
 #include <utility.h>
 
-SkyrimDataArchives::SkyrimDataArchives(const QDir& myGamesDir)
-    : GamebryoDataArchives(myGamesDir)
-{}
-
 QStringList SkyrimDataArchives::vanillaArchives() const
 {
   return {"Skyrim - Misc.bsa",        "Skyrim - Shaders.bsa",
@@ -21,7 +17,7 @@ QStringList SkyrimDataArchives::archives(const MOBase::IProfile* profile) const
 
   QString iniFile = profile->localSettingsEnabled()
                         ? QDir(profile->absolutePath()).absoluteFilePath("skyrim.ini")
-                        : m_LocalGameDir.absoluteFilePath("skyrim.ini");
+                        : localGameDirectory().absoluteFilePath("skyrim.ini");
   result.append(getArchivesFromKey(iniFile, "SResourceArchiveList"));
   result.append(getArchivesFromKey(iniFile, "SResourceArchiveList2"));
 
@@ -35,7 +31,7 @@ void SkyrimDataArchives::writeArchiveList(MOBase::IProfile* profile,
 
   QString iniFile = profile->localSettingsEnabled()
                         ? QDir(profile->absolutePath()).absoluteFilePath("skyrim.ini")
-                        : m_LocalGameDir.absoluteFilePath("skyrim.ini");
+                        : localGameDirectory().absoluteFilePath("skyrim.ini");
   if (list.length() > 255) {
     int splitIdx = list.lastIndexOf(",", 256);
     setArchivesToKey(iniFile, "SResourceArchiveList", list.mid(0, splitIdx));
diff --git a/src/skyrimdataarchives.h b/src/skyrimdataarchives.h
index a6f074a..b8c2ae0 100644
--- a/src/skyrimdataarchives.h
+++ b/src/skyrimdataarchives.h
@@ -9,11 +9,9 @@
 
 class SkyrimDataArchives : public GamebryoDataArchives
 {
-
 public:
-  SkyrimDataArchives(const QDir& myGamesDir);
+  using GamebryoDataArchives::GamebryoDataArchives;
 
-public:
   virtual QStringList vanillaArchives() const override;
   virtual QStringList archives(const MOBase::IProfile* profile) const override;