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

1 files changed, 2 insertions, 64 deletions

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