Refactoring of game features for better management. (#39)

ModOrganizer2 · Jun 9, 2024 · b3ba731 · b3ba731
1 parent a23d73d
commit b3ba731
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 24 deletions.
diff --git a/src/falloutttwbsainvalidation.cpp b/src/falloutttwbsainvalidation.cpp
@@ -1,6 +1,6 @@
 #include "falloutttwbsainvalidation.h"
 
-FalloutTTWBSAInvalidation::FalloutTTWBSAInvalidation(DataArchives* dataArchives,
+FalloutTTWBSAInvalidation::FalloutTTWBSAInvalidation(MOBase::DataArchives* dataArchives,
                                                      MOBase::IPluginGame const* game)
     : GamebryoBSAInvalidation(dataArchives, "fallout.ini", game)
 {}

diff --git a/src/falloutttwbsainvalidation.h b/src/falloutttwbsainvalidation.h
@@ -9,7 +9,7 @@
 class FalloutTTWBSAInvalidation : public GamebryoBSAInvalidation
 {
 public:
-  FalloutTTWBSAInvalidation(DataArchives* dataArchives,
+  FalloutTTWBSAInvalidation(MOBase::DataArchives* dataArchives,
                             MOBase::IPluginGame const* game);
 
 private:

diff --git a/src/falloutttwmoddatacontent.h b/src/falloutttwmoddatacontent.h
@@ -10,8 +10,8 @@ class FalloutTTWModDataContent : public GamebryoModDataContent
   /**
    *
    */
-  FalloutTTWModDataContent(GameGamebryo const* gamePlugin)
-      : GamebryoModDataContent(gamePlugin)
+  FalloutTTWModDataContent(MOBase::IGameFeatures const* gameFeatures)
+      : GamebryoModDataContent(gameFeatures)
   {
     // Just need to disable some contents:
     m_Enabled[CONTENT_MCM]     = false;

diff --git a/src/game_ttw_en.ts b/src/game_ttw_en.ts
@@ -4,17 +4,17 @@
 <context>
     <name>GameFalloutTTW</name>
     <message>
-        <location filename="gamefalloutttw.cpp" line="186"/>
+        <location filename="gamefalloutttw.cpp" line="193"/>
         <source>Fallout TTW Support Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="gamefalloutttw.cpp" line="196"/>
+        <location filename="gamefalloutttw.cpp" line="203"/>
         <source>Adds support for the game Fallout TTW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="gamefalloutttw.cpp" line="208"/>
+        <location filename="gamefalloutttw.cpp" line="215"/>
         <source>While not recommended by the TTW modding community, enables LOOT sorting</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/gamefalloutttw.cpp b/src/gamefalloutttw.cpp
@@ -35,17 +35,20 @@ bool GameFalloutTTW::init(IOrganizer* moInfo)
     return false;
   }
 
-  registerFeature<ScriptExtender>(new FalloutTTWScriptExtender(this));
-  registerFeature<DataArchives>(new FalloutTTWDataArchives(myGamesPath()));
-  registerFeature<BSAInvalidation>(
-      new FalloutTTWBSAInvalidation(feature<DataArchives>(), this));
-  registerFeature<SaveGameInfo>(new GamebryoSaveGameInfo(this));
-  registerFeature<LocalSavegames>(
-      new GamebryoLocalSavegames(myGamesPath(), "fallout.ini"));
-  registerFeature<ModDataChecker>(new FalloutTTWModDataChecker(this));
-  registerFeature<ModDataContent>(new FalloutTTWModDataContent(this));
-  registerFeature<GamePlugins>(new GamebryoGamePlugins(moInfo));
-  registerFeature<UnmanagedMods>(new GamebryoUnmangedMods(this));
+  auto dataArchives = std::make_shared<FalloutTTWDataArchives>(myGamesPath());
+  registerFeature(std::make_shared<FalloutTTWScriptExtender>(this));
+  registerFeature(dataArchives);
+  registerFeature(
+      std::make_shared<FalloutTTWBSAInvalidation>(dataArchives.get(), this));
+  registerFeature(std::make_shared<GamebryoSaveGameInfo>(this));
+  registerFeature(
+      std::make_shared<GamebryoLocalSavegames>(myGamesPath(), "fallout.ini"));
+  registerFeature(std::make_shared<FalloutTTWModDataChecker>(this));
+  registerFeature(
+      std::make_shared<FalloutTTWModDataContent>(m_Organizer->gameFeatures()));
+  registerFeature(std::make_shared<GamebryoGamePlugins>(moInfo));
+  registerFeature(std::make_shared<GamebryoUnmangedMods>(this));
+
   return true;
 }
 
@@ -104,11 +107,13 @@ void GameFalloutTTW::setGamePath(const QString& path)
   m_GamePath = path;
   checkVariants();
   m_MyGamesPath = determineMyGamesPath(gameDirectoryName());
-  registerFeature<DataArchives>(new FalloutTTWDataArchives(myGamesPath()));
-  registerFeature<BSAInvalidation>(
-      new FalloutTTWBSAInvalidation(feature<DataArchives>(), this));
-  registerFeature<LocalSavegames>(
-      new GamebryoLocalSavegames(myGamesPath(), "fallout.ini"));
+
+  auto dataArchives = std::make_shared<FalloutTTWDataArchives>(myGamesPath());
+  registerFeature(dataArchives);
+  registerFeature(
+      std::make_shared<FalloutTTWBSAInvalidation>(dataArchives.get(), this));
+  registerFeature(
+      std::make_shared<GamebryoLocalSavegames>(myGamesPath(), "fallout.ini"));
 }
 
 QDir GameFalloutTTW::savesDirectory() const
@@ -161,7 +166,9 @@ QList<ExecutableInfo> GameFalloutTTW::executables() const
                                      .withArgument("--game=\"FalloutNV\"");
   if (selectedVariant() != "Epic Games") {
     extraExecutables.prepend(ExecutableInfo(
-        "NVSE", findInGameFolder(feature<ScriptExtender>()->loaderName())));
+        "NVSE", findInGameFolder(m_Organizer->gameFeatures()
+                                     ->gameFeature<MOBase::ScriptExtender>()
+                                     ->loaderName())));
   } else {
     game.withArgument("-EpicPortal");
     launcher.withArgument("-EpicPortal");