Merge remote-tracking branch 'TanninOne/master'

# Conflicts:
#	SConstruct
#	src/modinfo.cpp
#	src/modinfo.h

1 files changed, 11 insertions, 20 deletions

diff --git a/src/shared/oblivioninfo.cpp b/src/shared/oblivioninfo.cpp
index 16748f58..730c186b 100644
--- a/src/shared/oblivioninfo.cpp
+++ b/src/shared/oblivioninfo.cpp
@@ -63,17 +63,7 @@ std::wstring OblivionInfo::getRegPathStatic()
   }

 }

 

-

-

-

-

-

-

-

-

-

-

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

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

 {

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

                                 (L"Knights.esp")

@@ -89,22 +79,18 @@ std::vector<std::wstring> OblivionInfo::getDLCPlugins()
 }

 

 

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

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

 {

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

 }

 

 

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

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

 {

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

 }

 

-

-

-

-

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

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

 {

   if (nmmScheme) {

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

@@ -125,7 +111,7 @@ int OblivionInfo::getNexusModIDStatic()
   return 38277;

 }

 

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

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

 {

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

 

@@ -137,9 +123,14 @@ bool OblivionInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*)
   return false;

 }

 

-std::wstring OblivionInfo::getReferenceDataFile()

+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