From 82e6c98043bd18f5329e8b6d0a6f99c4d28cc0a2 Mon Sep 17 00:00:00 2001
From: Thomas Tanner <trtanner@btinternet.com>
Date: Thu, 26 Nov 2015 07:39:35 +0000
Subject: Replace last occurrence of GameInfo::getNexusGameID and remove a
 whole load of gameinfo.h includes

---
 src/shared/fallout3info.h  |  1 -
 src/shared/falloutnvinfo.h |  1 -
 src/shared/gameinfo.h      | 33 +++++++++++++--------------------
 src/shared/oblivioninfo.h  |  1 -
 src/shared/skyriminfo.h    |  1 -
 5 files changed, 13 insertions(+), 24 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/fallout3info.h b/src/shared/fallout3info.h
index b5585eaf..e6064825 100644
--- a/src/shared/fallout3info.h
+++ b/src/shared/fallout3info.h
@@ -50,7 +50,6 @@ public:
   virtual std::wstring getReferenceDataFile();
 
   virtual std::wstring getNexusPage(bool nmmScheme = true);
-  virtual int getNexusGameID() { return 120; }
 
   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath);
 
diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h
index 40e11720..aa187fb3 100644
--- a/src/shared/falloutnvinfo.h
+++ b/src/shared/falloutnvinfo.h
@@ -50,7 +50,6 @@ public:
   virtual std::wstring getReferenceDataFile();
 
   virtual std::wstring getNexusPage(bool nmmScheme = true);
-  virtual int getNexusGameID() { return 130; }
 
   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath);
 
diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h
index 45069165..b6a4f142 100644
--- a/src/shared/gameinfo.h
+++ b/src/shared/gameinfo.h
@@ -47,29 +47,30 @@ public:
     TYPE_SKYRIM
   };
 
-  enum LoadOrderMechanism {
-    TYPE_FILETIME,
-    TYPE_PLUGINSTXT
-  };
-
 public:
 
   virtual ~GameInfo() {}
 
-  //**USED ONLY IN HOOKDLL
-  virtual std::wstring getRegPath() = 0;
-
   //**Used only in savegame which needs refactoring a lot.
   virtual GameInfo::Type getType() = 0;
 
+  //**Used only in savegame which needs refactoring a lot.
+  // get a list of file extensions for additional files belonging to a save game
+  virtual std::vector<std::wstring> getSavegameAttachmentExtensions() = 0;
+
   //**Currently only used in a nasty mess at initialisation time.
   virtual std::wstring getGameName() const = 0;
 
   //**USED IN HOOKDLL and in initialisation
   virtual std::wstring getGameDirectory() const;
 
-  // get a list of file extensions for additional files belonging to a save game
-  virtual std::vector<std::wstring> getSavegameAttachmentExtensions() = 0;
+  //**USED IN HOOKDLL and initialisation
+  // initialise with the path to the mo directory (needs to be where hook.dll is stored). This
+  // needs to be called before the instance can be retrieved
+  static bool init(const std::wstring &moDirectory, const std::wstring &gamePath = L"");
+
+  //**USED ONLY IN HOOKDLL
+  virtual std::wstring getRegPath() = 0;
 
   //**USED ONLY IN HOOKDLL
   // file name of this games ini file(s)
@@ -78,20 +79,12 @@ public:
   //**USED ONLY IN HOOKDLL
   virtual std::wstring getReferenceDataFile() = 0;
 
-  virtual std::wstring getNexusPage(bool nmmScheme = true) = 0;
-  virtual int getNexusGameID() = 0;
-
   //**USED ONLY IN HOOKDLL
   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath) = 0;
 
-public:
-
-  //**USED IN HOOKDLL
-  // initialise with the path to the mo directory (needs to be where hook.dll is stored). This
-  // needs to be called before the instance can be retrieved
-  static bool init(const std::wstring &moDirectory, const std::wstring &gamePath = L"");
+  virtual std::wstring getNexusPage(bool nmmScheme = true) = 0;
 
-  //**USED IN HOOKDLL
+  //**USED IN HOOKDLL and everywhere that uses GameInfo
   static GameInfo& instance();
 
 protected:
diff --git a/src/shared/oblivioninfo.h b/src/shared/oblivioninfo.h
index b6b3d867..f9045703 100644
--- a/src/shared/oblivioninfo.h
+++ b/src/shared/oblivioninfo.h
@@ -48,7 +48,6 @@ public:
   virtual std::wstring getReferenceDataFile();
 
   virtual std::wstring getNexusPage(bool nmmScheme = true);
-  virtual int getNexusGameID() { return 101; }
 
   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath);
 
diff --git a/src/shared/skyriminfo.h b/src/shared/skyriminfo.h
index ee81ace3..47a35b3e 100644
--- a/src/shared/skyriminfo.h
+++ b/src/shared/skyriminfo.h
@@ -52,7 +52,6 @@ public:
   virtual std::wstring getNexusPage(bool nmmScheme = true);
 
   static int getNexusGameIDStatic() { return 110; }
-  virtual int getNexusGameID() { return getNexusGameIDStatic(); }
 
   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath);
 
-- 
cgit v1.3.1