Remove most instances of GameInfo::getname, and transfer getDLCPlugins to the plugingame interface

Also commented out startDownloadNexusFile as it doesn't appear to be used anywhere

9 files changed, 0 insertions, 133 deletions

diff --git a/src/shared/fallout3info.cpp b/src/shared/fallout3info.cpp
index 9c6ad5b9..95d1d299 100644
--- a/src/shared/fallout3info.cpp
+++ b/src/shared/fallout3info.cpp
@@ -63,16 +63,6 @@ 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>();

diff --git a/src/shared/fallout3info.h b/src/shared/fallout3info.h
index 90bb6ec0..ae6a27c7 100644
--- a/src/shared/fallout3info.h
+++ b/src/shared/fallout3info.h
@@ -43,7 +43,6 @@ public:
   virtual std::wstring getGameName() const { return L"Fallout 3"; }

   virtual std::wstring getGameShortName() const { return L"Fallout3"; }

 

-  virtual std::vector<std::wstring> getDLCPlugins();

   virtual std::vector<std::wstring> getSavegameAttachmentExtensions();

 

   // file name of this games ini (no path)

diff --git a/src/shared/falloutnvinfo.cpp b/src/shared/falloutnvinfo.cpp
index 4601caf5..b5fb4f04 100644
--- a/src/shared/falloutnvinfo.cpp
+++ b/src/shared/falloutnvinfo.cpp
@@ -63,20 +63,6 @@ std::wstring FalloutNVInfo::getRegPathStatic()
   }

 }

 

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

-{

-  return boost::assign::list_of (L"DeadMoney.esm")

-                                (L"HonestHearts.esm")

-                                (L"OldWorldBlues.esm")

-                                (L"LonesomeRoad.esm")

-                                (L"GunRunnersArsenal.esm")

-                                (L"CaravanPack.esm")

-                                (L"ClassicPack.esm")

-                                (L"MercenaryPack.esm")

-                                (L"TribalPack.esm")

-      ;

-}

-

 std::vector<std::wstring> FalloutNVInfo::getSavegameAttachmentExtensions()

 {

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

diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h
index 613694b2..2179bf2f 100644
--- a/src/shared/falloutnvinfo.h
+++ b/src/shared/falloutnvinfo.h
@@ -43,40 +43,6 @@ public:
   virtual std::wstring getGameName() const { return L"New Vegas"; }

   virtual std::wstring getGameShortName() const { return L"FalloutNV"; }

 

-//  virtual bool requiresSteam() const { return true; }

-

-/*  virtual std::wstring getInvalidationBSA()

-  {

-    return L"Fallout - Invalidation.bsa";

-  }

-

-  virtual bool isInvalidationBSA(const std::wstring &bsaName)

-  {

-    static LPCWSTR invalidation[] = { L"Fallout - AI!.bsa", L"Fallout - Invalidation.bsa", nullptr };

-

-    for (int i = 0; invalidation[i] != nullptr; ++i) {

-      if (wcscmp(bsaName.c_str(), invalidation[i]) == 0) {

-        return true;

-      }

-    }

-    return false;

-  }

-

-  virtual std::vector<std::wstring> getVanillaBSAs()

-  {

-    return boost::assign::list_of (L"Fallout - Textures.bsa")

-        (L"Fallout - Textures2.bsa")

-        (L"Fallout - Meshes.bsa")

-        (L"Fallout - Voices1.bsa")

-        (L"Fallout - Sound.bsa")

-        (L"Fallout - Misc.bsa");

-  }

-

-  virtual std::vector<std::wstring> getPrimaryPlugins()

-  {

-    return boost::assign::list_of(L"falloutnv.esm");

-  }*/

-  virtual std::vector<std::wstring> getDLCPlugins();

   virtual std::vector<std::wstring> getSavegameAttachmentExtensions();

 

   // file name of this games ini (no path)

diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h
index e1a70597..9ae42159 100644
--- a/src/shared/gameinfo.h
+++ b/src/shared/gameinfo.h
@@ -74,9 +74,6 @@ public:
   // get a list of file extensions for additional files belonging to a save game

   virtual std::vector<std::wstring> getSavegameAttachmentExtensions() = 0;

 

-  // get a set of esp/esm files that are part of known dlcs

-  virtual std::vector<std::wstring> getDLCPlugins() = 0;

-

   //**USED IN HOOKDLL

   // file name of this games ini file(s)

   virtual std::vector<std::wstring> getIniFileNames() = 0;

diff --git a/src/shared/oblivioninfo.cpp b/src/shared/oblivioninfo.cpp
index 4b0a8499..27de1275 100644
--- a/src/shared/oblivioninfo.cpp
+++ b/src/shared/oblivioninfo.cpp
@@ -66,29 +66,6 @@ std::wstring OblivionInfo::getRegPathStatic()
 

 

 

-

-

-

-

-

-

-

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

-{

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

 {

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

diff --git a/src/shared/oblivioninfo.h b/src/shared/oblivioninfo.h
index fcdac6bd..2a550e0e 100644
--- a/src/shared/oblivioninfo.h
+++ b/src/shared/oblivioninfo.h
@@ -40,41 +40,6 @@ public:
 

   virtual std::wstring getGameName() const { return L"Oblivion"; }

   virtual std::wstring getGameShortName() const { return L"Oblivion"; }

-/*

-  virtual std::wstring getInvalidationBSA()

-  {

-    return L"Oblivion - Invalidation.bsa";

-  }

-

-  virtual bool isInvalidationBSA(const std::wstring &bsaName)

-  {

-    static LPCWSTR invalidation[] = { L"Oblivion - Invalidation.bsa", L"ArchiveInvalidationInvalidated!.bsa",

-                                      L"BSARedirection.bsa", nullptr };

-

-    for (int i = 0; invalidation[i] != nullptr; ++i) {

-      if (wcscmp(bsaName.c_str(), invalidation[i]) == 0) {

-        return true;

-      }

-    }

-    return false;

-  }

-

-  virtual std::vector<std::wstring> getVanillaBSAs()

-  {

-    return boost::assign::list_of(L"Oblivion - Meshes.bsa")

-        (L"Oblivion - Textures - Compressed.bsa")

-        (L"Oblivion - Sounds.bsa")

-        (L"Oblivion - Voices1.bsa")

-        (L"Oblivion - Voices2.bsa")

-        (L"Oblivion - Misc.bsa");

-  }

-

-  virtual std::vector<std::wstring> getPrimaryPlugins()

-  {

-    return boost::assign::list_of(L"oblivion.esm");

-  }*/

-

-  virtual std::vector<std::wstring> getDLCPlugins();

   virtual std::vector<std::wstring> getSavegameAttachmentExtensions();

 

   // file name of this games ini (no path)

diff --git a/src/shared/skyriminfo.cpp b/src/shared/skyriminfo.cpp
index bd901357..189d2ed0 100644
--- a/src/shared/skyriminfo.cpp
+++ b/src/shared/skyriminfo.cpp
@@ -91,17 +91,6 @@ GameInfo::LoadOrderMechanism SkyrimInfo::getLoadOrderMechanism() const
   }

 }

 

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

-{

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

 {

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

diff --git a/src/shared/skyriminfo.h b/src/shared/skyriminfo.h
index f26cd065..741f76c9 100644
--- a/src/shared/skyriminfo.h
+++ b/src/shared/skyriminfo.h
@@ -45,8 +45,6 @@ public:
 

   virtual LoadOrderMechanism getLoadOrderMechanism() const;

 

-  virtual std::vector<std::wstring> getDLCPlugins();

-

   virtual std::vector<std::wstring> getSavegameAttachmentExtensions();

 

   // file name of this games ini (no path)