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

ModOrganizer2 · Jun 14, 2024 · 9f67175 · 9f67175
1 parent b2e1ecf
commit 9f67175
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/src/game_skyrimvr_en.ts b/src/game_skyrimvr_en.ts
@@ -4,12 +4,12 @@
 <context>
     <name>GameSkyrimVR</name>
     <message>
-        <location filename="gameskyrimvr.cpp" line="117"/>
+        <location filename="gameskyrimvr.cpp" line="118"/>
         <source>Skyrim VR Support Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="gameskyrimvr.cpp" line="127"/>
+        <location filename="gameskyrimvr.cpp" line="128"/>
         <source>Adds support for the game Skyrim VR.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/gameskyrimvr.cpp b/src/gameskyrimvr.cpp
@@ -68,9 +68,8 @@ bool GameSkyrimVR::init(IOrganizer* moInfo)
   }
 
   registerFeature(std::make_shared<SkyrimVRScriptExtender>(this));
-  registerFeature(std::make_shared<SkyrimVRDataArchives>(myGamesPath()));
-  registerFeature(
-      std::make_shared<GamebryoLocalSavegames>(myGamesPath(), "SkyrimVR.ini"));
+  registerFeature(std::make_shared<SkyrimVRDataArchives>(this));
+  registerFeature(std::make_shared<GamebryoLocalSavegames>(this, "SkyrimVR.ini"));
   registerFeature(std::make_shared<SkyrimVRModDataChecker>(this));
   registerFeature(std::make_shared<GamebryoSaveGameInfo>(this));
   registerFeature(

diff --git a/src/skyrimvrdataarchives.cpp b/src/skyrimvrdataarchives.cpp
@@ -3,10 +3,6 @@
 #include "iprofile.h"
 #include <utility.h>
 
-SkyrimVRDataArchives::SkyrimVRDataArchives(const QDir& myGamesDir)
-    : GamebryoDataArchives(myGamesDir)
-{}
-
 QStringList SkyrimVRDataArchives::vanillaArchives() const
 {
   return {"Skyrim - Textures0.bsa", "Skyrim - Textures1.bsa", "Skyrim - Textures2.bsa",
@@ -24,7 +20,7 @@ QStringList SkyrimVRDataArchives::archives(const MOBase::IProfile* profile) cons
 
   QString iniFile = profile->localSettingsEnabled()
                         ? QDir(profile->absolutePath()).absoluteFilePath("skyrimvr.ini")
-                        : m_LocalGameDir.absoluteFilePath("skyrimvr.ini");
+                        : localGameDirectory().absoluteFilePath("skyrimvr.ini");
   result.append(getArchivesFromKey(iniFile, "SResourceArchiveList"));
   result.append(getArchivesFromKey(iniFile, "SResourceArchiveList2"));
 
@@ -38,7 +34,7 @@ void SkyrimVRDataArchives::writeArchiveList(MOBase::IProfile* profile,
 
   QString iniFile = profile->localSettingsEnabled()
                         ? QDir(profile->absolutePath()).absoluteFilePath("skyrimvr.ini")
-                        : m_LocalGameDir.absoluteFilePath("skyrimvr.ini");
+                        : localGameDirectory().absoluteFilePath("skyrimvr.ini");
   if (list.length() > 255) {
     int splitIdx = list.lastIndexOf(",", 256);
     setArchivesToKey(iniFile, "SResourceArchiveList", list.mid(0, splitIdx));

diff --git a/src/skyrimvrdataarchives.h b/src/skyrimvrdataarchives.h
@@ -12,11 +12,9 @@ class IProfile;
 
 class SkyrimVRDataArchives : public GamebryoDataArchives
 {
-
 public:
-  SkyrimVRDataArchives(const QDir& myGamesDir);
+  using GamebryoDataArchives::GamebryoDataArchives;
 
-public:
   virtual QStringList vanillaArchives() const override;
   virtual QStringList archives(const MOBase::IProfile* profile) const override;