Refactoring following uibase change for game features. (#31)

ModOrganizer2 · Jun 9, 2024 · 17db11d · 17db11d
1 parent 0639a0e
commit 17db11d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/gameskyrimvr.cpp b/src/gameskyrimvr.cpp
@@ -68,14 +68,14 @@ bool GameSkyrimVR::init(IOrganizer *moInfo)
     return false;
   }
 
-  registerFeature<ScriptExtender>(new SkyrimVRScriptExtender(this));
-  registerFeature<DataArchives>(new SkyrimVRDataArchives(myGamesPath()));
-  registerFeature<LocalSavegames>(new GamebryoLocalSavegames(myGamesPath(), "SkyrimVR.ini"));
-  registerFeature<ModDataChecker>(new SkyrimVRModDataChecker(this));
-  registerFeature<SaveGameInfo>(new GamebryoSaveGameInfo(this));
-  registerFeature<ModDataContent>(new SkyrimVRModDataContent(this));
-  registerFeature<GamePlugins>(new SkyrimVRGamePlugins(moInfo));
-  registerFeature<UnmanagedMods>(new SkyrimVRUnmangedMods(this));
+  registerFeature(std::make_shared<SkyrimVRScriptExtender>(this));
+  registerFeature(std::make_shared<SkyrimVRDataArchives>(myGamesPath()));
+  registerFeature(std::make_shared<GamebryoLocalSavegames>(myGamesPath(), "SkyrimVR.ini"));
+  registerFeature(std::make_shared<SkyrimVRModDataChecker>(this));
+  registerFeature(std::make_shared<GamebryoSaveGameInfo>(this));
+  registerFeature(std::make_shared<SkyrimVRModDataContent>(m_Organizer->gameFeatures()));
+  registerFeature(std::make_shared<SkyrimVRGamePlugins>(moInfo));
+  registerFeature(std::make_shared<SkyrimVRUnmangedMods>(this));
 
   return true;
 }
@@ -90,7 +90,7 @@ QString GameSkyrimVR::gameName() const
 QList<ExecutableInfo> GameSkyrimVR::executables() const
 {
   return QList<ExecutableInfo>()
-    << ExecutableInfo("SKSE", findInGameFolder(feature<ScriptExtender>()->loaderName()))
+    << ExecutableInfo("SKSE", findInGameFolder(m_Organizer->gameFeatures()->gameFeature<MOBase::ScriptExtender>()->loaderName()))
     << ExecutableInfo("Skyrim VR", findInGameFolder(binaryName()))
     << ExecutableInfo("Creation Kit", findInGameFolder("CreationKit.exe"))
     << ExecutableInfo("LOOT", QFileInfo(getLootPath())).withArgument("--game=\"Skyrim VR\"")

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