WINTERMUTE: Privatize more members of BaseGame.

2 files changed, 12 insertions, 8 deletions

diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 4dfe45592b..5be1457668 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -94,10 +94,10 @@ public:
 	bool _shuttingDown;
 
 	virtual bool displayDebugInfo();
-	bool _debugShowFPS;
+
+	void setShowFPS(bool enabled) { _debugShowFPS = enabled; }
 
 	bool _suspendedRendering;
-	int _soundBufferSizeSec;
 
 	TTextEncoding _textEncoding;
 	bool _textRTL;
@@ -152,11 +152,8 @@ public:
 	BaseGame(const Common::String &gameId);
 	virtual ~BaseGame();
 
-	void DEBUG_DebugDisable();
-	void DEBUG_DebugEnable(const char *filename = nullptr);
 	bool _debugDebugMode;
 
-	void *_debugLogFile;
 	int _sequence;
 	virtual bool loadFile(const char *filename);
 	virtual bool loadBuffer(byte *buffer, bool complete = true);
@@ -268,13 +265,20 @@ protected:
 	VideoPlayer *_videoPlayer;
 	VideoTheoraPlayer *_theoraPlayer;
 private:
+	bool _debugShowFPS;
+	void *_debugLogFile;
+	void DEBUG_DebugDisable();
+	void DEBUG_DebugEnable(const char *filename = nullptr);
+
 	BaseObject *_mainObject;
 
 	bool _mouseRightDown;
 	bool _mouseMidlleDown;
 	
 	BaseGameSettings *_settings;
-	
+
+	int _soundBufferSizeSec;
+
 	virtual bool invalidateDeviceObjects();
 	virtual bool restoreDeviceObjects();
 
diff --git a/engines/wintermute/debugger.cpp b/engines/wintermute/debugger.cpp
index 0dab75356b..92b8e6251f 100644
--- a/engines/wintermute/debugger.cpp
+++ b/engines/wintermute/debugger.cpp
@@ -40,9 +40,9 @@ Console::~Console(void) {
 bool Console::Cmd_ShowFps(int argc, const char **argv) {
 	if (argc > 1) {
 		if (Common::String(argv[1]) == "true") {
-			_engineRef->_game->_debugShowFPS = true;
+			_engineRef->_game->setShowFPS(true);
 		} else if (Common::String(argv[1]) == "false") {
-			_engineRef->_game->_debugShowFPS = false;
+			_engineRef->_game->setShowFPS(false);;
 		}
 	}
 	return true;