[Scummvm-git-logs] scummvm master -> f002a0fc23b2d3ab133be901dae9356441d32c21

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f002a0fc23 DIRECTOR: Fix GCC Shadowing Warnings


Commit: f002a0fc23b2d3ab133be901dae9356441d32c21
    https://github.com/scummvm/scummvm/commit/f002a0fc23b2d3ab133be901dae9356441d32c21
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-28T02:33:53+01:00

Commit Message:
DIRECTOR: Fix GCC Shadowing Warnings

Changed paths:
    engines/director/channel.cpp
    engines/director/window.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 744613b0bc..31c785efa3 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -137,22 +137,22 @@ bool Channel::isDirty(Sprite *nextSprite) {
 	if (!nextSprite)
 		return false;
 
-	bool isDirty = _dirty ||
+	bool isDirtyFlag = _dirty ||
 		_delta != Common::Point(0, 0) ||
 		(_sprite->_cast && _sprite->_cast->isModified());
 
 	if (!_sprite->_puppet) {
 		// When puppet is set, the overall dirty flag should be set when sprite is
 		// modified.
-		isDirty |= _sprite->_castId != nextSprite->_castId ||
+		isDirtyFlag |= _sprite->_castId != nextSprite->_castId ||
 			_sprite->_ink != nextSprite->_ink;
 		if (!_sprite->_moveable)
-			isDirty |= _currentPoint != nextSprite->_startPoint;
+			isDirtyFlag |= _currentPoint != nextSprite->_startPoint;
 		if (!_sprite->_stretch)
-			isDirty |= _width != nextSprite->_width || _height != nextSprite->_height;
+			isDirtyFlag |= _width != nextSprite->_width || _height != nextSprite->_height;
 	}
 
-	return isDirty;
+	return isDirtyFlag;
 }
 
 bool Channel::isStretched() {
diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index 4cab35bc74..cd177dd366 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -195,8 +195,8 @@ void Window::inkBlitShape(DirectorPlotData *pd, Common::Rect &srcRect) {
 		break;
 	}
 
-	Common::Rect fillRect((int)srcRect.width(), (int)srcRect.height());
-	fillRect.moveTo(srcRect.left, srcRect.top);
+	Common::Rect fillAreaRect((int)srcRect.width(), (int)srcRect.height());
+	fillAreaRect.moveTo(srcRect.left, srcRect.top);
 	Graphics::MacPlotData plotFill(pd->dst, nullptr, &g_director->getPatterns(), pd->ms->pattern, srcRect.left, srcRect.top, 1, pd->ms->backColor);
 
 	Common::Rect strokeRect(MAX((int)srcRect.width() - pd->ms->lineSize, 0), MAX((int)srcRect.height() - pd->ms->lineSize, 0));
@@ -206,7 +206,7 @@ void Window::inkBlitShape(DirectorPlotData *pd, Common::Rect &srcRect) {
 	switch (pd->ms->spriteType) {
 	case kRectangleSprite:
 		pd->ms->pd = &plotFill;
-		Graphics::drawFilledRect(fillRect, pd->ms->foreColor, g_director->getInkDrawPixel(), pd);
+		Graphics::drawFilledRect(fillAreaRect, pd->ms->foreColor, g_director->getInkDrawPixel(), pd);
 		// fall through
 	case kOutlinedRectangleSprite:
 		pd->ms->pd = &plotStroke;
@@ -214,7 +214,7 @@ void Window::inkBlitShape(DirectorPlotData *pd, Common::Rect &srcRect) {
 		break;
 	case kRoundedRectangleSprite:
 		pd->ms->pd = &plotFill;
-		Graphics::drawRoundRect(fillRect, 12, pd->ms->foreColor, true, g_director->getInkDrawPixel(), pd);
+		Graphics::drawRoundRect(fillAreaRect, 12, pd->ms->foreColor, true, g_director->getInkDrawPixel(), pd);
 		// fall through
 	case kOutlinedRoundedRectangleSprite:
 		pd->ms->pd = &plotStroke;
@@ -222,7 +222,7 @@ void Window::inkBlitShape(DirectorPlotData *pd, Common::Rect &srcRect) {
 		break;
 	case kOvalSprite:
 		pd->ms->pd = &plotFill;
-		Graphics::drawEllipse(fillRect.left, fillRect.top, fillRect.right, fillRect.bottom, pd->ms->foreColor, true, g_director->getInkDrawPixel(), pd);
+		Graphics::drawEllipse(fillAreaRect.left, fillAreaRect.top, fillAreaRect.right, fillAreaRect.bottom, pd->ms->foreColor, true, g_director->getInkDrawPixel(), pd);
 		// fall through
 	case kOutlinedOvalSprite:
 		pd->ms->pd = &plotStroke;