diff --git a/src/game_starfield_en.ts b/src/game_starfield_en.ts
index 38326b0..3113ee9 100644
--- a/src/game_starfield_en.ts
+++ b/src/game_starfield_en.ts
@@ -4,95 +4,50 @@
GameStarfield
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
StarfieldModDataContent
diff --git a/src/gamestarfield.cpp b/src/gamestarfield.cpp
index 77781ca..27aca4b 100644
--- a/src/gamestarfield.cpp
+++ b/src/gamestarfield.cpp
@@ -41,12 +41,11 @@ bool GameStarfield::init(IOrganizer* moInfo)
return false;
}
- auto dataArchives =
- std::make_shared(myGamesPath(), gameDirectory());
+ auto dataArchives = std::make_shared(this);
registerFeature(std::make_shared(this));
registerFeature(dataArchives);
registerFeature(
- std::make_shared(myGamesPath(), "StarfieldCustom.ini"));
+ std::make_shared(this, "StarfieldCustom.ini"));
registerFeature(std::make_shared(this));
registerFeature(
std::make_shared(m_Organizer->gameFeatures()));
diff --git a/src/starfielddataarchives.cpp b/src/starfielddataarchives.cpp
index 175550a..d7eadae 100644
--- a/src/starfielddataarchives.cpp
+++ b/src/starfielddataarchives.cpp
@@ -3,11 +3,6 @@
#include "iprofile.h"
#include
-StarfieldDataArchives::StarfieldDataArchives(const QDir& myGamesDir,
- const QDir& gamePath)
- : GamebryoDataArchives(myGamesDir), m_GamePath(gamePath.absolutePath())
-{}
-
QStringList StarfieldDataArchives::vanillaArchives() const
{
return {"Starfield - Animations.ba2",
@@ -71,11 +66,11 @@ QStringList StarfieldDataArchives::archives(const MOBase::IProfile* profile) con
{
QStringList result;
- QString defaultIniFile = m_GamePath.absoluteFilePath("Starfield.ini");
+ QString defaultIniFile = gameDirectory().absoluteFilePath("Starfield.ini");
QString customIniFile =
profile->localSettingsEnabled()
? QDir(profile->absolutePath()).absoluteFilePath("StarfieldCustom.ini")
- : m_LocalGameDir.absoluteFilePath("StarfieldCustom.ini");
+ : localGameDirectory().absoluteFilePath("StarfieldCustom.ini");
QStringList archiveSettings = {"SResourceArchiveList", "sResourceIndexFileList",
"SResourceArchiveMemoryCacheList",
"sResourceStartUpArchiveList",
diff --git a/src/starfielddataarchives.h b/src/starfielddataarchives.h
index f889c00..c83943f 100644
--- a/src/starfielddataarchives.h
+++ b/src/starfielddataarchives.h
@@ -1,23 +1,18 @@
#ifndef STARFIELDDATAARCHIVES_H
#define STARFIELDDATAARCHIVES_H
-#include "gamebryodataarchives.h"
-
-namespace MOBase
-{
-class IProfile;
-}
-
#include
#include
+#include "gamebryodataarchives.h"
+
+class GameGamebryo;
+
class StarfieldDataArchives : public GamebryoDataArchives
{
-
public:
- StarfieldDataArchives(const QDir& myGamesDir, const QDir& gamePath);
+ using GamebryoDataArchives::GamebryoDataArchives;
-public:
virtual QStringList vanillaArchives() const override;
virtual QStringList archives(const MOBase::IProfile* profile) const override;
virtual void addArchive(MOBase::IProfile* profile, int index,
@@ -25,9 +20,6 @@ class StarfieldDataArchives : public GamebryoDataArchives
virtual void removeArchive(MOBase::IProfile* profile,
const QString& archiveName) override;
-protected:
- const QDir m_GamePath;
-
private:
virtual void writeArchiveList(MOBase::IProfile* profile,
const QStringList& before) override;