Merge branch 'master' into issue/344

# Conflicts:
#	src/gameinfoimpl.cpp
#	src/gameinfoimpl.h
#	src/shared/fallout3info.h
#	src/shared/falloutnvinfo.h
#	src/shared/gameinfo.h
#	src/shared/oblivioninfo.h
#	src/shared/skyriminfo.h

11 files changed, 39 insertions, 389 deletions

diff --git a/src/shared/fallout3info.cpp b/src/shared/fallout3info.cpp
index f0776a7d..797d68ec 100644
--- a/src/shared/fallout3info.cpp
+++ b/src/shared/fallout3info.cpp
@@ -30,8 +30,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 namespace MOShared {

 

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

-  : GameInfo(moDirectory, moDataDirectory, gameDirectory)

+Fallout3Info::Fallout3Info(const std::wstring &gameDirectory)

+  : GameInfo(gameDirectory)

 {

   identifyMyGamesDirectory(L"fallout3");

 }

@@ -63,21 +63,6 @@ std::wstring Fallout3Info::getRegPathStatic()
 }

 

 

-std::vector<std::wstring> Fallout3Info::getDLCPlugins() const

-{

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

-                                (L"Anchorage.esm")

-                                (L"BrokenSteel.esm")

-                                (L"PointLookout.esm")

-                                (L"Zeta.esm")

-      ;

-}

-

-std::vector<std::wstring> Fallout3Info::getSavegameAttachmentExtensions() const

-{

-  return std::vector<std::wstring>();

-}

-

 std::vector<std::wstring> Fallout3Info::getIniFileNames() const

 {

   return boost::assign::list_of(L"fallout.ini")(L"falloutprefs.ini");

@@ -88,25 +73,6 @@ std::wstring Fallout3Info::getReferenceDataFile() const
   return L"Fallout - Meshes.bsa";

 }

 

-std::wstring Fallout3Info::getNexusPage(bool nmmScheme) const

-{

-  if (nmmScheme) {

-    return L"http://nmm.nexusmods.com/fallout3";

-  } else {

-    return L"http://www.nexusmods.com/fallout3";

-  }

-}

-

-std::wstring Fallout3Info::getNexusInfoUrlStatic()

-{

-  return L"http://nmm.nexusmods.com/fallout3";

-}

-

-int Fallout3Info::getNexusModIDStatic()

-{

-  return 16348;

-}

-

 bool Fallout3Info::rerouteToProfile(const wchar_t *fileName, const wchar_t*) const

 {

   static LPCWSTR profileFiles[] = { L"fallout.ini", L"falloutprefs.ini", L"plugins.txt", nullptr };

@@ -119,9 +85,4 @@ bool Fallout3Info::rerouteToProfile(const wchar_t *fileName, const wchar_t*) con
   return false;

 }

 

-bool Fallout3Info::isValidModURL(int modID, const std::wstring &url) const

-{

-  return GameInfo::isValidModURL(modID, url, L"http://fallout3.nexusmods.com");

-}

-

 } // namespace MOShared

diff --git a/src/shared/fallout3info.h b/src/shared/fallout3info.h
index fb60d6ae..5cf98e3b 100644
--- a/src/shared/fallout3info.h
+++ b/src/shared/fallout3info.h
@@ -36,38 +36,19 @@ public:
 

   static std::wstring getRegPathStatic();

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

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

-  virtual std::wstring getExtenderName() const { return L"fose_loader.exe"; }

-

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

-

-  virtual std::wstring getGameName() const { return L"Fallout 3"; }

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

-

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

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

 

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

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

 

   virtual std::wstring getReferenceDataFile() const;

 

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

-  static std::wstring getNexusInfoUrlStatic();

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

-  static int getNexusModIDStatic();

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

-  virtual int getNexusGameID() const { return 120; }

-

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

 

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

 

-  virtual bool isValidModURL(int modID, std::wstring const &url) const;

-

 private:

 

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

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

 

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

 

diff --git a/src/shared/falloutnvinfo.cpp b/src/shared/falloutnvinfo.cpp
index f6de72e3..6347224d 100644
--- a/src/shared/falloutnvinfo.cpp
+++ b/src/shared/falloutnvinfo.cpp
@@ -31,8 +31,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 namespace MOShared {

 

 

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

-  : GameInfo(moDirectory, moDataDirectory, gameDirectory)

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

+  : GameInfo(gameDirectory)

 {

   identifyMyGamesDirectory(L"falloutnv");

 }

@@ -63,25 +63,6 @@ std::wstring FalloutNVInfo::getRegPathStatic()
   }

 }

 

-std::vector<std::wstring> FalloutNVInfo::getDLCPlugins() const

-{

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

-                                (L"HonestHearts.esm")

-                                (L"OldWorldBlues.esm")

-                                (L"LonesomeRoad.esm")

-                                (L"GunRunnersArsenal.esm")

-                                (L"CaravanPack.esm")

-                                (L"ClassicPack.esm")

-                                (L"MercenaryPack.esm")

-                                (L"TribalPack.esm")

-      ;

-}

-

-std::vector<std::wstring> FalloutNVInfo::getSavegameAttachmentExtensions() const

-{

-  return std::vector<std::wstring>();

-}

-

 std::vector<std::wstring> FalloutNVInfo::getIniFileNames() const

 {

   return boost::assign::list_of(L"fallout.ini")(L"falloutprefs.ini");

@@ -92,28 +73,6 @@ std::wstring FalloutNVInfo::getReferenceDataFile() const
   return L"Fallout - Meshes.bsa";

 }

 

-std::wstring FalloutNVInfo::getNexusPage(bool nmmScheme) const

-{

-  if (nmmScheme) {

-    return L"http://nmm.nexusmods.com/newvegas";

-  } else {

-    return L"http://www.nexusmods.com/newvegas";

-  }

-}

-

-

-std::wstring FalloutNVInfo::getNexusInfoUrlStatic()

-{

-  return L"http://nmm.nexusmods.com/newvegas";

-}

-

-

-int FalloutNVInfo::getNexusModIDStatic()

-{

-  return 42572;

-}

-

-

 bool FalloutNVInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*) const

 {

   static LPCWSTR profileFiles[] = { L"fallout.ini", L"falloutprefs.ini", L"plugins.txt", nullptr };

@@ -126,9 +85,4 @@ bool FalloutNVInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*) co
   return false;

 }

 

-bool FalloutNVInfo::isValidModURL(int modID, std::wstring const &url) const

-{

-  return GameInfo::isValidModURL(modID, url, L"http://newvegas.nexusmods.com");

-}

-

 } // namespace MOShared

diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h
index 65f17013..04c13c7d 100644
--- a/src/shared/falloutnvinfo.h
+++ b/src/shared/falloutnvinfo.h
@@ -37,38 +37,19 @@ public:
 

   static std::wstring getRegPathStatic();

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

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

-  virtual std::wstring getExtenderName() const { return L"nvse_loader.exe"; }

-

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

-

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

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

-

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

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

 

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

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

 

   virtual std::wstring getReferenceDataFile() const;

 

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

-  static std::wstring getNexusInfoUrlStatic();

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

-  static int getNexusModIDStatic();

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

-  virtual int getNexusGameID() const { return 130; }

-

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

 

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

 

-  virtual bool isValidModURL(int modID, const std::wstring &url) 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);

 };

diff --git a/src/shared/gameinfo.cpp b/src/shared/gameinfo.cpp
index 5338c069..5c13a520 100644
--- a/src/shared/gameinfo.cpp
+++ b/src/shared/gameinfo.cpp
@@ -40,8 +40,8 @@ namespace MOShared {
 GameInfo* GameInfo::s_Instance = nullptr;

 

 

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

-  : m_GameDirectory(gameDirectory), m_OrganizerDirectory(moDirectory), m_OrganizerDataDirectory(moDataDirectory)

+GameInfo::GameInfo(const std::wstring &gameDirectory)

+  : m_GameDirectory(gameDirectory)

 {

   atexit(&cleanup);

 }

@@ -86,50 +86,36 @@ void GameInfo::identifyMyGamesDirectory(const std::wstring &file)
   }

 }

 

-bool GameInfo::isValidModURL(int modID, const std::wstring &url, const std::wstring &alt) const

-{

-  std::wostringstream os;

-  os << getNexusPage(false) << "/mods/" << modID;

-  if (url == os.str()) {

-    return true;

-  }

-  os.clear();

-  os.str(L"");

-  os << alt << "/mods/" << modID;

-  return url == os.str();

-}

-

-

-bool GameInfo::identifyGame(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &searchPath)

+bool GameInfo::identifyGame(const std::wstring &searchPath)

 {

   if (OblivionInfo::identifyGame(searchPath)) {

-    s_Instance = new OblivionInfo(moDirectory, moDataDirectory, searchPath);

+    s_Instance = new OblivionInfo(searchPath);

   } else if (Fallout3Info::identifyGame(searchPath)) {

-    s_Instance = new Fallout3Info(moDirectory, moDataDirectory, searchPath);

+    s_Instance = new Fallout3Info(searchPath);

   } else if (FalloutNVInfo::identifyGame(searchPath)) {

-    s_Instance = new FalloutNVInfo(moDirectory, moDataDirectory, searchPath);

+    s_Instance = new FalloutNVInfo(searchPath);

   } else if (SkyrimInfo::identifyGame(searchPath)) {

-    s_Instance = new SkyrimInfo(moDirectory, moDataDirectory, searchPath);

+    s_Instance = new SkyrimInfo(searchPath);

   }

 

   return s_Instance != nullptr;

 }

 

 

-bool GameInfo::init(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gamePath)

+bool GameInfo::init(const std::wstring &moDirectory, const std::wstring &gamePath)

 {

   if (s_Instance == nullptr) {

     if (gamePath.length() == 0) {

       // search upward in the directory until a recognized game-binary is found

       std::wstring searchPath(moDirectory);

-      while (!identifyGame(moDirectory, moDataDirectory, searchPath)) {

+      while (!identifyGame(searchPath)) {

         size_t lastSep = searchPath.find_last_of(L"/\\");

         if (lastSep == std::string::npos) {

           return false;

         }

         searchPath.erase(lastSep);

       }

-    } else if (!identifyGame(moDirectory, moDataDirectory, gamePath)) {

+    } else if (!identifyGame(gamePath)) {

       return false;

     }

   }

@@ -148,24 +134,6 @@ std::wstring GameInfo::getGameDirectory() const
   return m_GameDirectory;

 }

 

-bool GameInfo::requiresSteam() const

-{

-  return FileExists(getGameDirectory() + L"\\steam_api.dll");

-}

-

-std::wstring GameInfo::getLocalAppFolder() const

-{

-  wchar_t localAppFolder[MAX_PATH];

-  memset(localAppFolder, '\0', MAX_PATH * sizeof(wchar_t));

-

-  if (::SHGetFolderPathW(nullptr, CSIDL_LOCAL_APPDATA, nullptr, SHGFP_TYPE_CURRENT, localAppFolder) == S_OK) {

-    return localAppFolder;

-  } else {

-    // fallback: try the registry

-    return getSpecialPath(L"Local AppData");

-  }

-}

-

 std::wstring GameInfo::getSpecialPath(LPCWSTR name) const

 {

   HKEY key;

diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h
index 55cd024a..7bc86d3a 100644
--- a/src/shared/gameinfo.h
+++ b/src/shared/gameinfo.h
@@ -40,82 +40,41 @@ class GameInfo
 

 public:

 

-  enum Type {

-    TYPE_OBLIVION,

-    TYPE_FALLOUT3,

-    TYPE_FALLOUTNV,

-    TYPE_SKYRIM

-  };

-

-  enum LoadOrderMechanism {

-    TYPE_FILETIME,

-    TYPE_PLUGINSTXT

-  };

-

-public:

-

   virtual ~GameInfo() {}

 

-  std::wstring getOrganizerDirectory() const { return m_OrganizerDirectory; }

-

-  virtual std::wstring getRegPath() const = 0;

-  virtual std::wstring getBinaryName() const = 0;

-  virtual std::wstring getExtenderName() const = 0;

-

-  virtual GameInfo::Type getType() const = 0;

-

-  virtual std::wstring getGameName() const = 0;

-  virtual std::wstring getGameShortName() const = 0;

+  //**USED IN HOOKDLL and at startup to set up for hookdll to work

+  // initialise with the path to the mo directory (needs to be where hook.dll is stored). This

+  // needs to be called before the instance can be retrieved

+  static bool init(const std::wstring &moDirectory, const std::wstring &gamePath = L"");

 

-  /// determine the load order mechanism used by this game. this may throw an

-  /// exception if the mechanism can't be determined

-  virtual LoadOrderMechanism getLoadOrderMechanism() const { return TYPE_FILETIME; }

+  //**USED ONLY IN HOOKDLL

+  static GameInfo& instance();

 

+  //**USED ONLY IN HOOKDLL

   virtual std::wstring getGameDirectory() const;

 

-  virtual bool requiresSteam() const;

-

-  // get a list of file extensions for additional files belonging to a save game

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

-

-  // get a set of esp/esm files that are part of known dlcs

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

+  //**USED ONLY IN HOOKDLL

+  virtual std::wstring getRegPath() const = 0;

 

+  //**USED ONLY IN HOOKDLL

   // file name of this games ini file(s)

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

 

+  //**USED ONLY IN HOOKDLL

   virtual std::wstring getReferenceDataFile() const = 0;

 

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

-  virtual std::wstring getNexusInfoUrl() const = 0;

-  virtual int getNexusModID() const = 0;

-  virtual int getNexusGameID() const = 0;

-

+  //**USED ONLY IN HOOKDLL

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

 

-  virtual bool isValidModURL(int modID, std::wstring const &url) const = 0;

-

-public:

-

-  // initialise with the path to the mo directory (needs to be where hook.dll is stored). This

-  // needs to be called before the instance can be retrieved

-  static bool init(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gamePath = L"");

-

-  static GameInfo& instance();

-

 protected:

 

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

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

 

-  std::wstring getLocalAppFolder() const;

-  const std::wstring &getMyGamesDirectory() const { return m_MyGamesDirectory; }

   void identifyMyGamesDirectory(const std::wstring &file);

 

-  bool isValidModURL(int modID, const std::wstring &url, const std::wstring &alt) const;

-

 private:

 

-  static bool identifyGame(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &searchPath);

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

   std::wstring getSpecialPath(LPCWSTR name) const;

 

   static void cleanup();

@@ -127,8 +86,6 @@ private:
   std::wstring m_MyGamesDirectory;

 

   std::wstring m_GameDirectory;

-  std::wstring m_OrganizerDirectory;

-  std::wstring m_OrganizerDataDirectory;

 

 };

 

diff --git a/src/shared/oblivioninfo.cpp b/src/shared/oblivioninfo.cpp
index 730c186b..b50f1daa 100644
--- a/src/shared/oblivioninfo.cpp
+++ b/src/shared/oblivioninfo.cpp
@@ -31,8 +31,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 namespace MOShared {

 

 

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

-  : GameInfo(moDirectory, moDataDirectory, gameDirectory)

+OblivionInfo::OblivionInfo(const std::wstring &gameDirectory)

+  : GameInfo(gameDirectory)

 {

   identifyMyGamesDirectory(L"oblivion");

 }

@@ -63,54 +63,11 @@ std::wstring OblivionInfo::getRegPathStatic()
   }

 }

 

-std::vector<std::wstring> OblivionInfo::getDLCPlugins() const

-{

-  return boost::assign::list_of (L"DLCShiveringIsles.esp")

-                                (L"Knights.esp")

-                                (L"DLCFrostcrag.esp")

-                                (L"DLCSpellTomes.esp")

-                                (L"DLCMehrunesRazor.esp")

-                                (L"DLCOrrery.esp")

-                                (L"DLCSpellTomes.esp")

-                                (L"DLCThievesDen.esp")

-                                (L"DLCVileLair.esp")

-                                (L"DLCHorseArmor.esp")

-      ;

-}

-

-

-std::vector<std::wstring> OblivionInfo::getSavegameAttachmentExtensions() const

-{

-  return boost::assign::list_of(L"obse");

-}

-

-

 std::vector<std::wstring> OblivionInfo::getIniFileNames() const

 {

   return boost::assign::list_of(L"oblivion.ini")(L"oblivionprefs.ini");

 }

 

-std::wstring OblivionInfo::getNexusPage(bool nmmScheme) const

-{

-  if (nmmScheme) {

-    return L"http://nmm.nexusmods.com/oblivion";

-  } else {

-    return L"http://www.nexusmods.com/oblivion";

-  }

-}

-

-

-std::wstring OblivionInfo::getNexusInfoUrlStatic()

-{

-  return L"http://nmm.nexusmods.com/oblivion";

-}

-

-

-int OblivionInfo::getNexusModIDStatic()

-{

-  return 38277;

-}

-

 bool OblivionInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*) const

 {

   static LPCWSTR profileFiles[] = { L"oblivion.ini", L"oblivionprefs.ini", L"plugins.txt", nullptr };

@@ -128,9 +85,4 @@ std::wstring OblivionInfo::getReferenceDataFile() const
   return L"Oblivion - Meshes.bsa";

 }

 

-bool OblivionInfo::isValidModURL(int modID, const std::wstring &url) const

-{

-  return GameInfo::isValidModURL(modID, url, L"http://oblivion.nexusmods.com");

-}

-

 } // namespace MOShared

diff --git a/src/shared/oblivioninfo.h b/src/shared/oblivioninfo.h
index 74e3fec6..bf0b2707 100644
--- a/src/shared/oblivioninfo.h
+++ b/src/shared/oblivioninfo.h
@@ -35,38 +35,19 @@ public:
 

   static std::wstring getRegPathStatic();

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

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

-  virtual std::wstring getExtenderName() const { return L"obse_loader.exe"; }

-

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

-

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

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

-

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

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

 

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

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

 

   virtual std::wstring getReferenceDataFile() const;

 

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

-  static std::wstring getNexusInfoUrlStatic();

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

-  static int getNexusModIDStatic();

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

-  virtual int getNexusGameID() const { return 101; }

-

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

 

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

 

-  virtual bool isValidModURL(int modID, std::wstring const &url) const;

-

 private:

 

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

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

 

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

 

diff --git a/src/shared/skyriminfo.cpp b/src/shared/skyriminfo.cpp
index 7c85fe10..9662e66d 100644
--- a/src/shared/skyriminfo.cpp
+++ b/src/shared/skyriminfo.cpp
@@ -33,8 +33,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 namespace MOShared {

 

 

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

-  : GameInfo(moDirectory, moDataDirectory, gameDirectory)

+SkyrimInfo::SkyrimInfo(const std::wstring &gameDirectory)

+  : GameInfo(gameDirectory)

 {

   identifyMyGamesDirectory(L"skyrim");

 

@@ -73,40 +73,6 @@ std::wstring SkyrimInfo::getRegPathStatic()
   }

 }

 

-GameInfo::LoadOrderMechanism SkyrimInfo::getLoadOrderMechanism() const

-{

-  std::wstring fileName = getGameDirectory() + L"\\TESV.exe";

-

-  try {

-    VS_FIXEDFILEINFO versionInfo = GetFileVersion(fileName);

-    if ((versionInfo.dwFileVersionMS > 0x10004) || // version >= 1.5.x?

-        ((versionInfo.dwFileVersionMS == 0x10004) && (versionInfo.dwFileVersionLS >= 0x1A0000))) { // version >= ?.4.26

-      return TYPE_PLUGINSTXT;

-    } else {

-      return TYPE_FILETIME;

-    }

-  } catch (const std::exception &e) {

-    log("TESV.exe is invalid: %s", e.what());

-    return TYPE_FILETIME;

-  }

-}

-

-std::vector<std::wstring> SkyrimInfo::getDLCPlugins() const

-{

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

-                                (L"Dragonborn.esm")

-                                (L"HearthFires.esm")

-                                (L"HighResTexturePack01.esp")

-                                (L"HighResTexturePack02.esp")

-                                (L"HighResTexturePack03.esp")

-      ;

-}

-

-std::vector<std::wstring> SkyrimInfo::getSavegameAttachmentExtensions() const

-{

-  return boost::assign::list_of(L"skse");

-}

-

 std::vector<std::wstring> SkyrimInfo::getIniFileNames() const

 {

   return boost::assign::list_of(L"skyrim.ini")(L"skyrimprefs.ini");

@@ -117,28 +83,6 @@ std::wstring SkyrimInfo::getReferenceDataFile() const
   return L"Skyrim - Meshes.bsa";

 }

 

-

-std::wstring SkyrimInfo::getNexusPage(bool nmmScheme) const

-{

-  if (nmmScheme) {

-    return L"http://nmm.nexusmods.com/skyrim";

-  } else {

-    return L"http://www.nexusmods.com/skyrim";

-  }

-}

-

-

-std::wstring SkyrimInfo::getNexusInfoUrlStatic()

-{

-  return L"http://nmm.nexusmods.com/skyrim";

-}

-

-

-int SkyrimInfo::getNexusModIDStatic()

-{

-  return 1334;

-}

-

 bool SkyrimInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath) const

 {

   static LPCWSTR profileFiles[] = { L"skyrim.ini", L"skyrimprefs.ini", L"loadorder.txt", nullptr };

@@ -157,10 +101,4 @@ bool SkyrimInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPa
   return false;

 }

 

-bool SkyrimInfo::isValidModURL(int modID, const std::wstring &url) const

-{

-  return GameInfo::isValidModURL(modID, url, L"http://skyrim.nexusmods.com");

-}

-

-

 } // namespace MOShared

diff --git a/src/shared/skyriminfo.h b/src/shared/skyriminfo.h
index 538fffb4..bd329403 100644
--- a/src/shared/skyriminfo.h
+++ b/src/shared/skyriminfo.h
@@ -37,41 +37,17 @@ public:
 

   static std::wstring getRegPathStatic();

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

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

-  virtual std::wstring getExtenderName() const { return L"skse_loader.exe"; }

-

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

-

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

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

-

-  virtual LoadOrderMechanism getLoadOrderMechanism() const;

-

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

-

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

 

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

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

 

   virtual std::wstring getReferenceDataFile() const;

 

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

-

-  static std::wstring getNexusInfoUrlStatic();

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

-  static int getNexusModIDStatic();

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

-  static int getNexusGameIDStatic() { return 110; }

-  virtual int getNexusGameID() const { return getNexusGameIDStatic(); }

-

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

 

-  virtual bool isValidModURL(int modID, std::wstring const &url) const;

-

 private:

 

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

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

 

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

 

diff --git a/src/shared/stackdata.cpp b/src/shared/stackdata.cpp
index 6c5a0968..b336593a 100644
--- a/src/shared/stackdata.cpp
+++ b/src/shared/stackdata.cpp
@@ -24,7 +24,7 @@ static void initDbgIfNecess()
       firstCall = false;

     }

     if (!::SymInitialize(process, NULL, TRUE)) {

-      printf("failed to initialize symbols: %d", ::GetLastError());

+      printf("failed to initialize symbols: %lu", ::GetLastError());

     }

     initialized.insert(::GetCurrentProcessId());

   }

@@ -99,7 +99,8 @@ void StackData::initTrace() {
   CONTEXT context;

   std::memset(&context, 0, sizeof(CONTEXT));

   context.ContextFlags = CONTEXT_CONTROL;

-#if BOOST_ARCH_X86_64

+  //Why only for 64 bit?

+#if BOOST_ARCH_X86_64 || defined(__clang__)

   ::RtlCaptureContext(&context);

 #else

   __asm