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, 41 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