Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 3 insertions, 42 deletions

diff --git a/src/shared/fallout3info.cpp b/src/shared/fallout3info.cpp
index a4b60410..446d4afe 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,48 +63,9 @@ std::wstring Fallout3Info::getRegPathStatic()
 }

 

 

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

-{

-  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()

-{

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

-}

-

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

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

 {

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

 }

 

-std::wstring Fallout3Info::getReferenceDataFile()

-{

-  return L"Fallout - Meshes.bsa";

-}

-

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

-{

-  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;

-}

-

 } // namespace MOShared