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, 50 deletions

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