1 files changed, 27 insertions, 11 deletions
diff --git a/src/organizercore.h b/src/organizercore.h
index b50b3e9f..cd7af1b8 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -12,6 +12,8 @@
 #include "installationmanager.h"
 #include "downloadmanager.h"
 #include "executableslist.h"
+#include "usvfsconnector.h"
+#include <directoryentry.h>
 #include <imoinfo.h>
 #include <iplugindiagnose.h>
 #include <versioninfo.h>
@@ -85,7 +87,7 @@ public:
   void connectPlugins(PluginContainer *container);
   void disconnectPlugins();
 
-  void setManagedGame(const MOBase::IPluginGame *game);
+  void setManagedGame(MOBase::IPluginGame *game);
 
   void updateExecutablesList(QSettings &settings);
 
@@ -127,8 +129,8 @@ public:
 
   void doAfterLogin(const std::function<void()> &function) { m_PostLoginTasks.append(function); }
 
-  void spawnBinary(const QFileInfo &binary, const QString &arguments = "", const QDir &currentDirectory = QDir(), bool closeAfterStart = true, const QString &steamAppID = "");
-  HANDLE spawnBinaryDirect(const QFileInfo &binary, const QString &arguments, const QString &profileName, const QDir &currentDirectory, const QString &steamAppID);
+  void spawnBinary(const Executable &exe);
+  HANDLE spawnBinaryDirect(const QFileInfo &binary, const QString &arguments, const QString &profileName, const QDir &currentDirectory, const QString &steamAppID, const QString &customOverwrite);
 
   void loginSuccessfulUpdate(bool necessary);
   void loginFailedUpdate(const QString &message);
@@ -137,6 +139,8 @@ public:
 
   MOBase::DelayedFileWriter &pluginsWriter() { return m_PluginListsWriter; }
 
+  void prepareVFS();
+
 public:
   MOBase::IModRepositoryBridge *createNexusBridge() const;
   QString profileName() const;
@@ -169,8 +173,6 @@ public:
   void refreshModList(bool saveChanges = true);
   QStringList modsSortedByProfilePriority() const;
 
-  //std::vector<std::pair<QString, QString> > fileMapping();
-
 public: // IPluginDiagnose interface
 
   virtual std::vector<unsigned int> activeProblems() const;
@@ -208,6 +210,8 @@ signals:
 
   void managedGameChanged(MOBase::IPluginGame const *gamePlugin);
 
+  void close();
+
 private:
 
   void storeSettings();
@@ -222,11 +226,22 @@ private:
 
   bool testForSteam();
 
-  /*
-   * std::vector<std::pair<QString, QString>> fileMapping(const QString &dataPath,
-                                                       const MOShared::DirectoryEntry *base,
-                                                       const MOShared::DirectoryEntry *directoryEntry);
-*/
+  /**
+   * @brief return a descriptor of the mappings real file->virtual file
+   */
+  std::vector<Mapping> fileMapping(const QString &profile,
+                                   const QString &customOverwrite);
+
+  std::vector<Mapping>
+  fileMapping(const QString &dataPath, const QString &relPath,
+              const MOShared::DirectoryEntry *base,
+              const MOShared::DirectoryEntry *directoryEntry,
+              int createDestination);
+
+  void spawnBinary(const QFileInfo &binary, const QString &arguments = "",
+                   const QDir &currentDirectory = QDir(),
+                   const QString &steamAppID = "",
+                   const QString &customOverwrite = "");
 
 private slots:
 
@@ -246,7 +261,7 @@ private:
   IUserInterface *m_UserInterface;
   PluginContainer *m_PluginContainer;
   QString m_GameName;
-  MOBase::IPluginGame const *m_GamePlugin;
+  MOBase::IPluginGame *m_GamePlugin;
 
   Profile *m_CurrentProfile;
 
@@ -282,6 +297,7 @@ private:
   bool m_ArchivesInit;
 
   MOBase::DelayedFileWriter m_PluginListsWriter;
+  UsvfsConnector m_USVFS;
 
 };