Gets rid of last vestiges of GameInfo apart from startup and hookdll

Working on sorting out savegame stuff

1 files changed, 6 insertions, 14 deletions

diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h
index a5c615cf..7bc86d3a 100644
--- a/src/shared/gameinfo.h
+++ b/src/shared/gameinfo.h
@@ -42,20 +42,16 @@ public:
 

   virtual ~GameInfo() {}

 

-  //**USED IN HOOKDLL and savegame code

-  static GameInfo& instance();

-

-  //**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() const = 0;

+  //**USED IN HOOKDLL and at startup to set up for hookdll to work

+  // 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 getGameDirectory() const;

+  static GameInfo& instance();

 

   //**USED ONLY 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 getGameDirectory() const;

 

   //**USED ONLY IN HOOKDLL

   virtual std::wstring getRegPath() const = 0;

@@ -74,12 +70,8 @@ protected:
 

   GameInfo(const std::wstring &gameDirectory);

 

-  std::wstring getLocalAppFolder() const;

-  const std::wstring &getMyGamesDirectory() const { return m_MyGamesDirectory; }

   void identifyMyGamesDirectory(const std::wstring &file);

 

-  bool isValidModURL(int modID, const std::wstring &url, const std::wstring &alt) const;

-

 private:

 

   static bool identifyGame(const std::wstring &searchPath);