WINTERMUTE: Privatize even more members in BaseGame.

scummvm · Apr 17, 2013 · 769b108 · 769b108
1 parent fd7c38f
commit 769b108
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
@@ -97,7 +97,7 @@ class BaseGame: public BaseObject {
 
 	void setShowFPS(bool enabled) { _debugShowFPS = enabled; }
 
-	bool _suspendedRendering;
+	bool getSuspendedRendering() const { return _suspendedRendering; }
 
 	TTextEncoding _textEncoding;
 	bool _textRTL;
@@ -179,7 +179,8 @@ class BaseGame: public BaseObject {
 	bool _subtitles; // RO
 
 	int _scheduledLoadSlot;
-	bool _loading;
+
+	bool getIsLoading() const { return _loading; }
 
 	virtual bool handleMouseWheel(int delta);
 	bool _quitting;
@@ -286,6 +287,7 @@ class BaseGame: public BaseObject {
 	bool _saveDirChecked;
 
 	Common::String _localSaveDir;
+	bool _loading;
 
 	bool _reportTextureFormat;
 
@@ -308,6 +310,8 @@ class BaseGame: public BaseObject {
 
 	void setWindowTitle();
 
+	bool _suspendedRendering;
+
 	BaseSprite *_cursorNoninteractive;
 	BaseKeyboardState *_keyboardState;
 

diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
@@ -243,7 +243,7 @@ bool BaseSubFrame::draw(int x, int y, BaseObject *registerOwner, float zoomX, fl
 			_gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef,  registerOwner, this, (int)(x - (_hotspotX + getRect().left) * (zoomX / 100)), (int)(y - (_hotspotY + getRect().top) * (zoomY / 100)), (int)((getRect().right - getRect().left) * (zoomX / 100)), (int)((getRect().bottom - getRect().top) * (zoomY / 100)), zoomX, zoomY, precise));
 		}
 	}
-	if (_gameRef->_suspendedRendering) {
+	if (_gameRef->getSuspendedRendering()) {
 		return STATUS_OK;
 	}
 

diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
@@ -243,10 +243,10 @@ int WintermuteEngine::messageLoop() {
 			}
 
 			// ***** flip
-			if (!_game->_suspendedRendering) {
+			if (!_game->getSuspendedRendering()) {
 				_game->_renderer->flip();
 			}
-			if (_game->_loading) {
+			if (_game->getIsLoading()) {
 				_game->loadGame(_game->_scheduledLoadSlot);
 			}
 			prevTime = time;