WINTERMUTE: Constify _width and _height in BaseRenderer.

12 files changed, 67 insertions, 63 deletions

diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index f0d2fcf5c8..6042bda060 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -849,10 +849,10 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		int height = stack->pop()->getInt();
 
 		if (width <= 0) {
-			width = _renderer->_width;
+			width = _renderer->getWidth();
 		}
 		if (height <= 0) {
-			height = _renderer->_height;
+			height = _renderer->getHeight();
 		}
 
 		if (!_sceneViewport) {
@@ -2259,10 +2259,10 @@ bool AdGame::displayDebugInfo() {
 	char str[100];
 	if (_gameRef->_debugDebugMode) {
 		sprintf(str, "Mouse: %d, %d (scene: %d, %d)", _mousePos.x, _mousePos.y, _mousePos.x + _scene->getOffsetLeft(), _mousePos.y + _scene->getOffsetTop());
-		_systemFont->drawText((byte *)str, 0, 90, _renderer->_width, TAL_RIGHT);
+		_systemFont->drawText((byte *)str, 0, 90, _renderer->getWidth(), TAL_RIGHT);
 
 		sprintf(str, "Scene: %s (prev: %s)", (_scene && _scene->getName()) ? _scene->getName() : "???", _prevSceneName ? _prevSceneName : "???");
-		_systemFont->drawText((byte *)str, 0, 110, _renderer->_width, TAL_RIGHT);
+		_systemFont->drawText((byte *)str, 0, 110, _renderer->getWidth(), TAL_RIGHT);
 	}
 	return BaseGame::displayDebugInfo();
 }
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 194d975155..4bb0905688 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -120,8 +120,8 @@ bool AdInventoryBox::display() {
 
 	if (_closeButton) {
 		_closeButton->_posX = _closeButton->_posY = 0;
-		_closeButton->_width = _gameRef->_renderer->_width;
-		_closeButton->_height = _gameRef->_renderer->_height;
+		_closeButton->_width = _gameRef->_renderer->getWidth();
+		_closeButton->_height = _gameRef->_renderer->getHeight();
 
 		_closeButton->display();
 	}
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index f2cf90a075..5a61184179 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -959,10 +959,10 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
 	if (_subtitlesWidth > 0) {
 		width = _subtitlesWidth;
 	} else {
-		if ((x < _gameRef->_renderer->_width / 4 || x > _gameRef->_renderer->_width * 0.75) && !_gameRef->_touchInterface) {
-			width = MAX(_gameRef->_renderer->_width / 4, MIN(x * 2, (_gameRef->_renderer->_width - x) * 2));
+		if ((x < _gameRef->_renderer->getWidth() / 4 || x > _gameRef->_renderer->getWidth() * 0.75) && !_gameRef->_touchInterface) {
+			width = MAX(_gameRef->_renderer->getWidth() / 4, MIN(x * 2, (_gameRef->_renderer->getWidth() - x) * 2));
 		} else {
-			width = _gameRef->_renderer->_width / 2;
+			width = _gameRef->_renderer->getWidth() / 2;
 		}
 	}
 
@@ -981,8 +981,8 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
 	}
 
 
-	x = MIN(MAX(0, x), _gameRef->_renderer->_width - width);
-	y = MIN(MAX(0, y), _gameRef->_renderer->_height - height);
+	x = MIN(MAX(0, x), _gameRef->_renderer->getWidth() - width);
+	y = MIN(MAX(0, y), _gameRef->_renderer->getHeight() - height);
 
 	_sentence->_width = width;
 
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index c891d2a019..e5116f78ec 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -179,7 +179,7 @@ bool AdResponseBox::createButtons() {
 
 				btn->_width = _responseArea.right - _responseArea.left;
 				if (btn->_width <= 0) {
-					btn->_width = _gameRef->_renderer->_width;
+					btn->_width = _gameRef->_renderer->getWidth();
 				}
 			}
 			btn->setName("response");
@@ -515,8 +515,8 @@ bool AdResponseBox::display() {
 	// go exclusive
 	if (_shieldWindow) {
 		_shieldWindow->_posX = _shieldWindow->_posY = 0;
-		_shieldWindow->_width = _gameRef->_renderer->_width;
-		_shieldWindow->_height = _gameRef->_renderer->_height;
+		_shieldWindow->_width = _gameRef->_renderer->getWidth();
+		_shieldWindow->_height = _gameRef->_renderer->getHeight();
 
 		_shieldWindow->display();
 	}
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 339c178078..53d6562215 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -1014,8 +1014,8 @@ bool AdScene::traverseNodes(bool doUpdate) {
 				}
 				if (_shieldWindow) {
 					_shieldWindow->_posX = _shieldWindow->_posY = 0;
-					_shieldWindow->_width = _gameRef->_renderer->_width;
-					_shieldWindow->_height = _gameRef->_renderer->_height;
+					_shieldWindow->_width = _gameRef->_renderer->getWidth();
+					_shieldWindow->_height = _gameRef->_renderer->getHeight();
 					_shieldWindow->display();
 				}
 			}
@@ -1694,10 +1694,10 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		int height = stack->pop()->getInt();
 
 		if (width <= 0) {
-			width = _gameRef->_renderer->_width;
+			width = _gameRef->_renderer->getWidth();
 		}
 		if (height <= 0) {
-			height = _gameRef->_renderer->_height;
+			height = _gameRef->_renderer->getHeight();
 		}
 
 		if (!_viewport) {
@@ -2569,10 +2569,10 @@ bool AdScene::getViewportSize(int *width, int *height) {
 		}
 	} else {
 		if (width) {
-			*width  = _gameRef->_renderer->_width;
+			*width  = _gameRef->_renderer->getWidth();
 		}
 		if (height) {
-			*height = _gameRef->_renderer->_height;
+			*height = _gameRef->_renderer->getHeight();
 		}
 	}
 	return STATUS_OK;
diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index 47b22a1ab3..69101fef7a 100644
--- a/engines/wintermute/ad/ad_sentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -56,7 +56,7 @@ AdSentence::AdSentence(BaseGame *inGame) : BaseClass(inGame) {
 	_font = nullptr;
 
 	_pos.x = _pos.y = 0;
-	_width = _gameRef->_renderer->_width;
+	_width = _gameRef->_renderer->getWidth();
 
 	_align = (TTextAlign)TAL_CENTER;
 
@@ -214,7 +214,7 @@ bool AdSentence::display() {
 
 
 		x = MAX(x, 0);
-		x = MIN(x, _gameRef->_renderer->_width - _width);
+		x = MIN(x, _gameRef->_renderer->getWidth() - _width);
 		y = MAX(y, 0);
 
 		_font->drawText((byte *)_text, x, y, _width, _align);
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 2ba54798ae..fae8d6780d 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -463,8 +463,8 @@ bool BaseGame::initialize2() { // we know whether we are going to be accelerated
 
 //////////////////////////////////////////////////////////////////////
 bool BaseGame::initialize3() { // renderer is initialized
-	_posX = _renderer->_width / 2;
-	_posY = _renderer->_height / 2;
+	_posX = _renderer->getWidth() / 2;
+	_posY = _renderer->getHeight() / 2;
 	_renderer->initIndicator();
 	return STATUS_OK;
 }
@@ -1105,9 +1105,9 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 		int x = stack->pop()->getInt();
 		int y = stack->pop()->getInt();
 		x = MAX(x, 0);
-		x = MIN(x, _renderer->_width);
+		x = MIN(x, _renderer->getWidth());
 		y = MAX(y, 0);
-		y = MIN(y, _renderer->_height);
+		y = MIN(y, _renderer->getHeight());
 		Point32 p;
 		p.x = x + _renderer->_drawOffsetX;
 		p.y = y + _renderer->_drawOffsetY;
@@ -1605,8 +1605,8 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 	else if (strcmp(name, "ScreenshotEx") == 0) {
 		stack->correctParams(3);
 		const char *filename = stack->pop()->getString();
-		int sizeX = stack->pop()->getInt(_renderer->_width);
-		int sizeY = stack->pop()->getInt(_renderer->_height);
+		int sizeX = stack->pop()->getInt(_renderer->getWidth());
+		int sizeY = stack->pop()->getInt(_renderer->getHeight());
 
 		bool ret = _gameRef->_renderer->saveScreenShot(filename, sizeX, sizeY);
 
@@ -2041,7 +2041,7 @@ ScValue *BaseGame::scGetProperty(const Common::String &name) {
 	// ScreenWidth (RO)
 	//////////////////////////////////////////////////////////////////////////
 	else if (name == "ScreenWidth") {
-		_scValue->setInt(_renderer->_width);
+		_scValue->setInt(_renderer->getWidth());
 		return _scValue;
 	}
 
@@ -2049,7 +2049,7 @@ ScValue *BaseGame::scGetProperty(const Common::String &name) {
 	// ScreenHeight (RO)
 	//////////////////////////////////////////////////////////////////////////
 	else if (name == "ScreenHeight") {
-		_scValue->setInt(_renderer->_height);
+		_scValue->setInt(_renderer->getHeight());
 		return _scValue;
 	}
 
@@ -2581,8 +2581,8 @@ bool BaseGame::displayQuickMsg() {
 
 	// display
 	for (uint32 i = 0; i < _quickMessages.size(); i++) {
-		_systemFont->drawText((const byte *)_quickMessages[i]->getText(), 0, posY, _renderer->_width);
-		posY += _systemFont->getTextHeight((const byte *)_quickMessages[i]->getText(), _renderer->_width);
+		_systemFont->drawText((const byte *)_quickMessages[i]->getText(), 0, posY, _renderer->getWidth());
+		posY += _systemFont->getTextHeight((const byte *)_quickMessages[i]->getText(), _renderer->getWidth());
 	}
 	return STATUS_OK;
 }
@@ -3364,8 +3364,8 @@ bool BaseGame::popViewport() {
 		_renderer->setViewport(_viewportStack[_viewportSP]->getRect());
 	} else _renderer->setViewport(_renderer->_drawOffsetX,
 		                              _renderer->_drawOffsetY,
-		                              _renderer->_width + _renderer->_drawOffsetX,
-		                              _renderer->_height + _renderer->_drawOffsetY);
+		                              _renderer->getWidth() + _renderer->_drawOffsetX,
+		                              _renderer->getHeight() + _renderer->_drawOffsetY);
 
 	return STATUS_OK;
 }
@@ -3384,8 +3384,8 @@ bool BaseGame::getCurrentViewportRect(Rect32 *rect, bool *custom) const {
 		} else {
 			BasePlatform::setRect(rect,   _renderer->_drawOffsetX,
 			                      _renderer->_drawOffsetY,
-			                      _renderer->_width + _renderer->_drawOffsetX,
-			                      _renderer->_height + _renderer->_drawOffsetY);
+			                      _renderer->getWidth() + _renderer->_drawOffsetX,
+			                      _renderer->getHeight() + _renderer->_drawOffsetY);
 			if (custom) {
 				*custom = false;
 			}
@@ -3759,33 +3759,33 @@ bool BaseGame::displayDebugInfo() {
 
 	if (_gameRef->_debugDebugMode) {
 		if (!_gameRef->_renderer->_windowed) {
-			sprintf(str, "Mode: %dx%dx%d", _renderer->_width, _renderer->_height, _renderer->_bPP);
+			sprintf(str, "Mode: %dx%dx%d", _renderer->getWidth(), _renderer->getHeight(), _renderer->_bPP);
 		} else {
-			sprintf(str, "Mode: %dx%d windowed", _renderer->_width, _renderer->_height);
+			sprintf(str, "Mode: %dx%d windowed", _renderer->getWidth(), _renderer->getHeight());
 		}
 
 		Common::strlcat(str, " (", strLength);
 		Common::strlcat(str, _renderer->getName().c_str(), strLength);
 		Common::strlcat(str, ")", strLength);
-		_systemFont->drawText((byte *)str, 0, 0, _renderer->_width, TAL_RIGHT);
+		_systemFont->drawText((byte *)str, 0, 0, _renderer->getWidth(), TAL_RIGHT);
 
 		_renderer->displayDebugInfo();
 
 		int scrTotal, scrRunning, scrWaiting, scrPersistent;
 		scrTotal = _scEngine->getNumScripts(&scrRunning, &scrWaiting, &scrPersistent);
 		sprintf(str, "Running scripts: %d (r:%d w:%d p:%d)", scrTotal, scrRunning, scrWaiting, scrPersistent);
-		_systemFont->drawText((byte *)str, 0, 70, _renderer->_width, TAL_RIGHT);
+		_systemFont->drawText((byte *)str, 0, 70, _renderer->getWidth(), TAL_RIGHT);
 
 
 		sprintf(str, "Timer: %d", _timer);
-		_gameRef->_systemFont->drawText((byte *)str, 0, 130, _renderer->_width, TAL_RIGHT);
+		_gameRef->_systemFont->drawText((byte *)str, 0, 130, _renderer->getWidth(), TAL_RIGHT);
 
 		if (_activeObject != nullptr) {
-			_systemFont->drawText((const byte *)_activeObject->getName(), 0, 150, _renderer->_width, TAL_RIGHT);
+			_systemFont->drawText((const byte *)_activeObject->getName(), 0, 150, _renderer->getWidth(), TAL_RIGHT);
 		}
 
 		sprintf(str, "GfxMem: %dMB", _usedMem / (1024 * 1024));
-		_systemFont->drawText((byte *)str, 0, 170, _renderer->_width, TAL_RIGHT);
+		_systemFont->drawText((byte *)str, 0, 170, _renderer->getWidth(), TAL_RIGHT);
 
 	}
 
diff --git a/engines/wintermute/base/base_viewport.cpp b/engines/wintermute/base/base_viewport.cpp
index 5a488b707f..b6c4eb5e3e 100644
--- a/engines/wintermute/base/base_viewport.cpp
+++ b/engines/wintermute/base/base_viewport.cpp
@@ -68,8 +68,8 @@ bool BaseViewport::setRect(int left, int top, int right, int bottom, bool noChec
 	if (!noCheck) {
 		left = MAX(left, 0);
 		top = MAX(top, 0);
-		right = MIN(right, _gameRef->_renderer->_width);
-		bottom = MIN(bottom, _gameRef->_renderer->_height);
+		right = MIN(right, _gameRef->_renderer->getWidth());
+		bottom = MIN(bottom, _gameRef->_renderer->getHeight());
 	}
 
 	BasePlatform::setRect(&_rect, left, top, right, bottom);
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index 5a24e0179a..92aa6bc735 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -168,8 +168,6 @@ public:
 	bool _ready;
 	bool _windowed;
 	int _bPP;
-	int _height;
-	int _width;
 	uint32 _window;
 	uint32 _forceAlphaColor;
 
@@ -186,7 +184,13 @@ public:
 	void setSaveImage(const char *filename, int x, int y);
 
 	bool displayIndicator();
+
+	int getWidth() const { return _width; }
+	int getHeight() const { return _height; }
 protected:
+	int _height;
+	int _width;
+
 	Common::String _loadImageName;
 	Common::String _saveImageName;
 	int _saveImageX;
@@ -205,7 +209,7 @@ protected:
 	bool _loadInProgress;
 	bool _indicatorDisplay;
 	int _indicatorProgress;
-protected:
+
 	uint32 _clipperWindow;
 
 	Rect32 _windowRect;
diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index c6eb871a85..e3f5fdcdec 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -280,7 +280,7 @@ bool BaseSoundMgr::resumeAll() {
 
 //////////////////////////////////////////////////////////////////////////
 float BaseSoundMgr::posToPan(int x, int y) {
-	float relPos = (float)x / ((float)_gameRef->_renderer->_width);
+	float relPos = (float)x / ((float)_gameRef->_renderer->getWidth());
 
 	float minPan = -0.7f;
 	float maxPan = 0.7f;
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 3089c79d31..460ec1877b 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -127,8 +127,8 @@ bool UIWindow::display(int offsetX, int offsetY) {
 		}
 		if (_shieldWindow) {
 			_shieldWindow->_posX = _shieldWindow->_posY = 0;
-			_shieldWindow->_width = _gameRef->_renderer->_width;
-			_shieldWindow->_height = _gameRef->_renderer->_height;
+			_shieldWindow->_width = _gameRef->_renderer->getWidth();
+			_shieldWindow->_height = _gameRef->_renderer->getHeight();
 
 			_shieldWindow->display();
 		}
@@ -141,8 +141,8 @@ bool UIWindow::display(int offsetX, int offsetY) {
 		}
 		if (_shieldButton) {
 			_shieldButton->_posX = _shieldButton->_posY = 0;
-			_shieldButton->_width = _gameRef->_renderer->_width;
-			_shieldButton->_height = _gameRef->_renderer->_height;
+			_shieldButton->_width = _gameRef->_renderer->getWidth();
+			_shieldButton->_height = _gameRef->_renderer->getHeight();
 
 			_shieldButton->display();
 		}
@@ -885,8 +885,8 @@ bool UIWindow::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "Center") == 0) {
 		stack->correctParams(0);
-		_posX = (_gameRef->_renderer->_width - _width) / 2;
-		_posY = (_gameRef->_renderer->_height - _height) / 2;
+		_posX = (_gameRef->_renderer->getWidth() - _width) / 2;
+		_posY = (_gameRef->_renderer->getHeight() - _height) / 2;
 		stack->pushNULL();
 		return STATUS_OK;
 	}
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 5bd50867d2..18498bfb41 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -224,8 +224,8 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame,
 		width = (float)_theoraDecoder->getWidth();
 		height = (float)_theoraDecoder->getHeight();
 	} else {
-		width = (float)_gameRef->_renderer->_width;
-		height = (float)_gameRef->_renderer->_height;
+		width = (float)_gameRef->_renderer->getWidth();
+		height = (float)_gameRef->_renderer->getHeight();
 	}
 
 	switch (type) {
@@ -236,18 +236,18 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame,
 		break;
 
 	case VID_PLAY_STRETCH: {
-		float zoomX = (float)((float)_gameRef->_renderer->_width / width * 100);
-		float zoomY = (float)((float)_gameRef->_renderer->_height / height * 100);
+		float zoomX = (float)((float)_gameRef->_renderer->getWidth() / width * 100);
+		float zoomY = (float)((float)_gameRef->_renderer->getHeight() / height * 100);
 		_playZoom = MIN(zoomX, zoomY);
-		_posX = (int)((_gameRef->_renderer->_width - width * (_playZoom / 100)) / 2);
-		_posY = (int)((_gameRef->_renderer->_height - height * (_playZoom / 100)) / 2);
+		_posX = (int)((_gameRef->_renderer->getWidth() - width * (_playZoom / 100)) / 2);
+		_posY = (int)((_gameRef->_renderer->getHeight() - height * (_playZoom / 100)) / 2);
 	}
 	break;
 
 	case VID_PLAY_CENTER:
 		_playZoom = 100.0f;
-		_posX = (int)((_gameRef->_renderer->_width - width) / 2);
-		_posY = (int)((_gameRef->_renderer->_height - height) / 2);
+		_posX = (int)((_gameRef->_renderer->getWidth() - width) / 2);
+		_posY = (int)((_gameRef->_renderer->getHeight() - height) / 2);
 		break;
 	}
 	_theoraDecoder->start();