From 76d9256679040abc8d566d9e579820861ff1a41f Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Wed, 17 Apr 2013 21:08:42 +0200
Subject: WINTERMUTE: Protect more members in BaseRenderer.

---
 engines/wintermute/base/base_game.cpp       |  8 ++++----
 engines/wintermute/base/gfx/base_renderer.h | 10 ++++++++--
 engines/wintermute/wintermute.cpp           |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index fae8d6780d..9ae44173e4 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -2001,7 +2001,7 @@ ScValue *BaseGame::scGetProperty(const Common::String &name) {
 	// WindowedMode (RO)
 	//////////////////////////////////////////////////////////////////////////
 	else if (name == "WindowedMode") {
-		_scValue->setBool(_renderer->_windowed);
+		_scValue->setBool(_renderer->isWindowed());
 		return _scValue;
 	}
 
@@ -3726,7 +3726,7 @@ bool BaseGame::onMouseMiddleUp() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::onPaint() {
-	if (_renderer && _renderer->_windowed && _renderer->_ready) {
+	if (_renderer && _renderer->isWindowed() && _renderer->isReady()) {
 		_renderer->initLoop();
 		displayContent(false, true);
 		displayDebugInfo();
@@ -3758,8 +3758,8 @@ bool BaseGame::displayDebugInfo() {
 	}
 
 	if (_gameRef->_debugDebugMode) {
-		if (!_gameRef->_renderer->_windowed) {
-			sprintf(str, "Mode: %dx%dx%d", _renderer->getWidth(), _renderer->getHeight(), _renderer->_bPP);
+		if (!_gameRef->_renderer->isWindowed()) {
+			sprintf(str, "Mode: %dx%dx%d", _renderer->getWidth(), _renderer->getHeight(), _renderer->getBPP());
 		} else {
 			sprintf(str, "Mode: %dx%d windowed", _renderer->getWidth(), _renderer->getHeight());
 		}
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index 92aa6bc735..971d0dfb55 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -166,8 +166,11 @@ public:
 	bool pointInViewport(Point32 *P);
 	bool _active;
 	bool _ready;
-	bool _windowed;
-	int _bPP;
+
+	bool isReady() const { return _ready; }
+	bool isWindowed() const { return _windowed; }
+	int getBPP() const { return _bPP; }
+
 	uint32 _window;
 	uint32 _forceAlphaColor;
 
@@ -191,6 +194,9 @@ protected:
 	int _height;
 	int _width;
 
+	bool _windowed;
+	int _bPP;
+
 	Common::String _loadImageName;
 	Common::String _saveImageName;
 	int _saveImageX;
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 567b2551bb..89a6f1b3e0 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -230,7 +230,7 @@ int WintermuteEngine::messageLoop() {
 			_trigDebug = false;
 		}
 
-		if (_game && _game->_renderer->_active && _game->_renderer->_ready) {
+		if (_game && _game->_renderer->_active && _game->_renderer->isReady()) {
 			_game->displayContent();
 			_game->displayQuickMsg();
 
-- 
cgit v1.2.3