Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 3 insertions, 60 deletions

diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h
index 5712c2ba..a9b3b9ec 100644
--- a/src/shared/falloutnvinfo.h
+++ b/src/shared/falloutnvinfo.h
@@ -36,71 +36,14 @@ public:
   virtual ~FalloutNVInfo() {}

 

   static std::wstring getRegPathStatic();

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

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

-

-  virtual GameInfo::Type getType() { return TYPE_FALLOUTNV; }

-

-  virtual std::wstring getGameName() const { return L"New Vegas"; }

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

-

-//  virtual bool requiresSteam() const { return true; }

-

-/*  virtual std::wstring getInvalidationBSA()

-  {

-    return L"Fallout - Invalidation.bsa";

-  }

-

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

-  {

-    static LPCWSTR invalidation[] = { L"Fallout - AI!.bsa", L"Fallout - Invalidation.bsa", nullptr };

-

-    for (int i = 0; invalidation[i] != nullptr; ++i) {

-      if (wcscmp(bsaName.c_str(), invalidation[i]) == 0) {

-        return true;

-      }

-    }

-    return false;

-  }

-

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

-  {

-    return boost::assign::list_of (L"Fallout - Textures.bsa")

-        (L"Fallout - Textures2.bsa")

-        (L"Fallout - Meshes.bsa")

-        (L"Fallout - Voices1.bsa")

-        (L"Fallout - Sound.bsa")

-        (L"Fallout - Misc.bsa");

-  }

-

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

-  {

-    return boost::assign::list_of(L"falloutnv.esm");

-  }*/

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

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

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

 

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

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

-

-  virtual std::wstring getReferenceDataFile();

-

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

-  static std::wstring getNexusInfoUrlStatic();

-  virtual std::wstring getNexusInfoUrl() { return getNexusInfoUrlStatic(); }

-  static int getNexusModIDStatic();

-  virtual int getNexusModID() { return getNexusModIDStatic(); }

-  virtual int getNexusGameID() { return 130; }

-

-  // 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::wstring archiveListKey() { return L"SArchiveList"; }

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

 

 private:

 

-  FalloutNVInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);

+  FalloutNVInfo(const std::wstring &gameDirectory);

 

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

 };