Update following gamebryo updates for myGamesPath() in game feature.

ModOrganizer2 · Jun 14, 2024 · a449364 · a449364
1 parent 03cd71b
commit a449364
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/src/game_oblivion_en.ts b/src/game_oblivion_en.ts
@@ -4,12 +4,12 @@
 <context>
     <name>GameOblivion</name>
     <message>
-        <location filename="gameoblivion.cpp" line="80"/>
+        <location filename="gameoblivion.cpp" line="84"/>
         <source>Oblivion Support Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="gameoblivion.cpp" line="90"/>
+        <location filename="gameoblivion.cpp" line="94"/>
         <source>Adds support for the game Oblivion</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/gameoblivion.cpp b/src/gameoblivion.cpp
@@ -30,13 +30,12 @@ bool GameOblivion::init(IOrganizer* moInfo)
     return false;
   }
 
-  auto dataArchives = std::make_shared<OblivionDataArchives>(myGamesPath());
+  auto dataArchives = std::make_shared<OblivionDataArchives>(this);
   registerFeature(std::make_shared<OblivionScriptExtender>(this));
   registerFeature(dataArchives);
   registerFeature(std::make_shared<OblivionBSAInvalidation>(dataArchives.get(), this));
   registerFeature(std::make_shared<GamebryoSaveGameInfo>(this));
-  registerFeature(
-      std::make_shared<GamebryoLocalSavegames>(myGamesPath(), "oblivion.ini"));
+  registerFeature(std::make_shared<GamebryoLocalSavegames>(this, "oblivion.ini"));
   registerFeature(std::make_shared<OblivionModDataChecker>(this));
   registerFeature(
       std::make_shared<OblivionModDataContent>(m_Organizer->gameFeatures()));

diff --git a/src/obliviondataarchives.cpp b/src/obliviondataarchives.cpp
@@ -1,10 +1,6 @@
 #include "obliviondataarchives.h"
 #include <utility.h>
 
-OblivionDataArchives::OblivionDataArchives(const QDir& myGamesDir)
-    : GamebryoDataArchives(myGamesDir)
-{}
-
 QStringList OblivionDataArchives::vanillaArchives() const
 {
   return {"Oblivion - Misc.bsa",    "Oblivion - Textures - Compressed.bsa",
@@ -18,7 +14,7 @@ QStringList OblivionDataArchives::archives(const MOBase::IProfile* profile) cons
 
   QString iniFile = profile->localSettingsEnabled()
                         ? QDir(profile->absolutePath()).absoluteFilePath("oblivion.ini")
-                        : m_LocalGameDir.absoluteFilePath("oblivion.ini");
+                        : localGameDirectory().absoluteFilePath("oblivion.ini");
   result.append(getArchivesFromKey(iniFile, "SArchiveList"));
 
   return result;
@@ -31,6 +27,6 @@ void OblivionDataArchives::writeArchiveList(MOBase::IProfile* profile,
 
   QString iniFile = profile->localSettingsEnabled()
                         ? QDir(profile->absolutePath()).absoluteFilePath("oblivion.ini")
-                        : m_LocalGameDir.absoluteFilePath("oblivion.ini");
+                        : localGameDirectory().absoluteFilePath("oblivion.ini");
   setArchivesToKey(iniFile, "SArchiveList", list);
 }
diff --git a/src/obliviondataarchives.h b/src/obliviondataarchives.h
@@ -9,11 +9,9 @@
 
 class OblivionDataArchives : public GamebryoDataArchives
 {
-
 public:
-  OblivionDataArchives(const QDir& myGamesDir);
+  using GamebryoDataArchives::GamebryoDataArchives;
 
-public:
   virtual QStringList vanillaArchives() const override;
   virtual QStringList archives(const MOBase::IProfile* profile) const override;