From 403fa669cd7ea9f860cc12137c8b576d0c0e7842 Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Sat, 9 Dec 2017 15:08:28 +0100
Subject: [PATCH] Remove getFSGame/getFSGameBase methods from IGameManager
 interface.

---
 include/igame.h                             |  6 ------
 plugins/script/interfaces/GameInterface.cpp | 12 ------------
 plugins/script/interfaces/GameInterface.h   |  2 --
 radiant/settings/GameManager.cpp            | 10 ----------
 radiant/settings/GameManager.h              |  6 ------
 5 files changed, 36 deletions(-)

diff --git a/include/igame.h b/include/igame.h
index 9d5c177d33..85e9c27b0b 100644
--- a/include/igame.h
+++ b/include/igame.h
@@ -67,12 +67,6 @@ class IGameManager :
 	// engine path is returned, e.g. /usr/local/doom3 or c:\games\doom3
 	virtual std::string getUserEnginePath() = 0;
 
-	// Returns the setting for fs_game
-	virtual const std::string& getFSGame() const = 0;
-
-	// Returns the setting for fs_game_base (can be empty)
-	virtual const std::string& getFSGameBase() const = 0;
-
 	/**
 	 * greebo: Gets the mod path (e.g. ~/.doom3/gathers/).
 	 * Returns the mod base path if the mod path itself is empty.
diff --git a/plugins/script/interfaces/GameInterface.cpp b/plugins/script/interfaces/GameInterface.cpp
index 62944fd567..e11428aa19 100644
--- a/plugins/script/interfaces/GameInterface.cpp
+++ b/plugins/script/interfaces/GameInterface.cpp
@@ -31,16 +31,6 @@ std::string GameInterface::getModBasePath()
 	return GlobalGameManager().getModBasePath();
 }
 
-std::string GameInterface::getFSGame()
-{
-	return GlobalGameManager().getFSGame();
-}
-
-std::string GameInterface::getFSGameBase()
-{
-	return GlobalGameManager().getFSGameBase();
-}
-
 ScriptGame GameInterface::currentGame() 
 {
 	return ScriptGame(GlobalGameManager().currentGame());
@@ -70,8 +60,6 @@ void GameInterface::registerInterface(py::module& scope, py::dict& globals)
 	gameManager.def("getUserEnginePath", &GameInterface::getUserEnginePath);
 	gameManager.def("getModPath", &GameInterface::getModPath);
 	gameManager.def("getModBasePath", &GameInterface::getModBasePath);
-	gameManager.def("getFSGame", &GameInterface::getFSGame);
-	gameManager.def("getFSGameBase", &GameInterface::getFSGameBase);
 	gameManager.def("currentGame", &GameInterface::currentGame);
 	gameManager.def("getVFSSearchPaths", &GameInterface::getVFSSearchPaths);
 
diff --git a/plugins/script/interfaces/GameInterface.h b/plugins/script/interfaces/GameInterface.h
index af51b83346..b93a0ca0c7 100644
--- a/plugins/script/interfaces/GameInterface.h
+++ b/plugins/script/interfaces/GameInterface.h
@@ -27,8 +27,6 @@ class GameInterface :
 	std::string getUserEnginePath();
 	std::string getModPath();
 	std::string getModBasePath();
-	std::string getFSGame();
-	std::string getFSGameBase();
 	ScriptGame currentGame();
 	PathList getVFSSearchPaths();
 
diff --git a/radiant/settings/GameManager.cpp b/radiant/settings/GameManager.cpp
index 5f78a8f365..59d58bee95 100644
--- a/radiant/settings/GameManager.cpp
+++ b/radiant/settings/GameManager.cpp
@@ -120,16 +120,6 @@ void Manager::initialiseModule(const ApplicationContext& ctx)
 	page.appendLabel(_("This page has been moved!\nPlease use the game settings dialog in the menu: File &gt; Game/Project Setup..."));
 }
 
-const std::string& Manager::getFSGame() const
-{
-	return GlobalRegistry().get(RKEY_FS_GAME);
-}
-
-const std::string& Manager::getFSGameBase() const 
-{
-	return GlobalRegistry().get(RKEY_FS_GAME_BASE);
-}
-
 const std::string& Manager::getModPath() const
 {
 	// Return the fs_game path if available
diff --git a/radiant/settings/GameManager.h b/radiant/settings/GameManager.h
index 07d8453144..ffa71f67c7 100644
--- a/radiant/settings/GameManager.h
+++ b/radiant/settings/GameManager.h
@@ -54,12 +54,6 @@ class Manager :
 	 */
 	const std::string& getModBasePath() const override;
 
-	// greebo: Accessor method for the fs_game parameter
-	const std::string& getFSGame() const override;
-
-	// greebo: Accessor method for the fs_game_base parameter
-	const std::string& getFSGameBase() const override;
-
 	// greebo: Returns the current Game (shared_ptr).
 	IGamePtr currentGame() override;