Merge with branch1.2

1 files changed, 2 insertions, 24 deletions

diff --git a/src/shared/fallout3info.h b/src/shared/fallout3info.h
index 1e8d1e0c..6e6a7b85 100644
--- a/src/shared/fallout3info.h
+++ b/src/shared/fallout3info.h
@@ -35,8 +35,6 @@ public:
 

   virtual ~Fallout3Info() {}

 

-  virtual unsigned long getBSAVersion();

-

   static std::wstring getRegPathStatic();

   virtual std::wstring getRegPath() { return getRegPathStatic(); }

   virtual std::wstring getBinaryName() { return L"Fallout3.exe"; }

@@ -46,32 +44,15 @@ public:
   virtual std::wstring getGameName() const { return L"Fallout 3"; }

   virtual std::wstring getGameShortName() const { return L"Fallout3"; }

 

-  virtual std::wstring getInvalidationBSA();

-

-  virtual bool isInvalidationBSA(const std::wstring &bsaName);

-

-  // full path to this games "My Games"-directory

-  virtual std::wstring getDocumentsDir();

-

-  virtual std::wstring getSaveGameDir();

-

-  virtual std::vector<std::wstring> getPrimaryPlugins();

-

-  virtual std::vector<std::wstring> getVanillaBSAs();

   virtual std::vector<std::wstring> getDLCPlugins();

   virtual std::vector<std::wstring> getSavegameAttachmentExtensions();

 

   // file name of this games ini (no path)

   virtual std::vector<std::wstring> getIniFileNames();

 

-  virtual std::wstring getSaveGameExtension();

   virtual std::wstring getReferenceDataFile();

-  virtual std::wstring getOMODExt();

 

   virtual std::vector<std::wstring> getSteamVariants() const;

-  virtual std::wstring getSteamAPPId(int variant = 0) const;

-

-  virtual std::wstring getSEName();

 

   virtual std::wstring getNexusPage(bool nmmScheme = true);

   static std::wstring getNexusInfoUrlStatic();

@@ -80,20 +61,17 @@ public:
   virtual int getNexusModID() { return getNexusModIDStatic(); }

   virtual int getNexusGameID() { return 120; }

 

-  virtual void createProfile(const std::wstring &directory, bool useDefaults);

-  virtual void repairProfile(const std::wstring &directory);

-

   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath);

 

   // get a list of executables (game binary and known-to-work 3rd party tools). All of these are relative to

   // the game directory

-  virtual std::vector<ExecutableInfo> getExecutables();

+  //virtual std::vector<ExecutableInfo> getExecutables();

 

   virtual std::wstring archiveListKey() { return L"SArchiveList"; }

 

 private:

 

-  Fallout3Info(const std::wstring &omoDirectory, const std::wstring &gameDirectory);

+  Fallout3Info(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);

 

   static bool identifyGame(const std::wstring &searchPath);