WINTERMUTE: Make the BaseEngine-singleton use Common::Singleton as super-class

1 files changed, 3 insertions, 6 deletions

diff --git a/engines/wintermute/base/base_engine.h b/engines/wintermute/base/base_engine.h
index 5782c012d8..d45d979f25 100644
--- a/engines/wintermute/base/base_engine.h
+++ b/engines/wintermute/base/base_engine.h
@@ -27,26 +27,23 @@
  */
  
  #include "common/str.h"
+ #include "common/singleton.h"
 
 namespace WinterMute {
 
 class BaseFileManager;
 class BaseRegistry;
 class BaseGame;
-class BaseEngine {
-	static BaseEngine *_instance;
-	BaseEngine();
+class BaseEngine : public Common::Singleton<WinterMute::BaseEngine> {
 	void init();
 	BaseFileManager *_fileManager;
 	BaseRegistry *_registry;
 	Common::String _gameId;
 	BaseGame *_gameRef;
 public:
+	BaseEngine();
 	~BaseEngine();
 	static void createInstance(const Common::String &gameid);
-	static BaseEngine *getInstance();
-	static void destroyInstance();
-
 	void setGameRef(BaseGame *gameRef) { _gameRef = gameRef; }
 
 	BaseGame *getGameRef() { return _gameRef; }