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

[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:
ea17d9422a TRECISION: Fix Shadowing Warnings


Commit: ea17d9422a1b445ce0f6e324a2f97e02a79b11ea
    https://github.com/scummvm/scummvm/commit/ea17d9422a1b445ce0f6e324a2f97e02a79b11ea
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-01T06:09:14+01:00

Commit Message:
TRECISION: Fix Shadowing Warnings

Changed paths:
    engines/trecision/graphics.cpp
    engines/trecision/video.cpp


diff --git a/engines/trecision/graphics.cpp b/engines/trecision/graphics.cpp
index b35598831c..10413264f6 100644
--- a/engines/trecision/graphics.cpp
+++ b/engines/trecision/graphics.cpp
@@ -363,11 +363,11 @@ void GraphicsManager::shadow(uint16 x, uint16 y, uint8 num) {
 	}
 
 	const uint16 val = (uint16)_screenBuffer.getPixel(x, y);
-	const uint16 shadow =
+	const uint16 shadowVal =
 			((((val & _bitMask[2]) * num >> 7) & _bitMask[2]) |
 			(((val & _bitMask[1]) * num >> 7) & _bitMask[1]) |
 			(((val & _bitMask[0]) * num >> 7) & _bitMask[0]));
-	_screenBuffer.setPixel(x, y, shadow);
+	_screenBuffer.setPixel(x, y, shadowVal);
 }
 
 void GraphicsManager::pixelAliasing(uint16 x, uint16 y) {
diff --git a/engines/trecision/video.cpp b/engines/trecision/video.cpp
index fbffd5064b..944ec00d96 100644
--- a/engines/trecision/video.cpp
+++ b/engines/trecision/video.cpp
@@ -82,7 +82,7 @@ bool NightlongSmackerDecoder::forceSeekToFrame(uint frame) {
 
 	stopAudio();
 	SmackerVideoTrack *videoTrack = (SmackerVideoTrack *)getTrack(0);
-	uint32 start = _fileStream->pos();
+	uint32 startPos = _fileStream->pos();
 	uint32 offset = 0;
 	for (uint32 i = 0; i < seekFrame; i++) {
 		videoTrack->increaseCurFrame();
@@ -90,13 +90,13 @@ bool NightlongSmackerDecoder::forceSeekToFrame(uint frame) {
 		// the previous palette as their base. Therefore, we need to
 		// parse all palette entries up to the requested frame
 		if (_frameTypes[videoTrack->getCurFrame()] & 1) {
-			_fileStream->seek(start + offset, SEEK_SET);
+			_fileStream->seek(startPos + offset, SEEK_SET);
 			videoTrack->unpackPalette(_fileStream);
 		}
 		offset += _frameSizes[i] & ~3;
 	}
 
-	if (!_fileStream->seek(start + offset, SEEK_SET))
+	if (!_fileStream->seek(startPos + offset, SEEK_SET))
 		return false;
 
 	while (getCurFrame() < (int)frame) {
@@ -484,16 +484,16 @@ void AnimManager::drawSmkBackgroundFrame(int animation) {
 	const byte *palette = smkDecoder->getPalette();
 
 	if (smkDecoder->getCurFrame() == 0 && !_bgAnimRestarted) {
-		bool drawFrame = true;
+		bool drawFrameFlag = true;
 
 		for (int32 i = 0; i < MAXCHILD; i++) {
 			if ((_animTab[animation]._flag & (SMKANIM_OFF1 << i))) {
-				drawFrame = false;
+				drawFrameFlag = false;
 				break;
 			}
 		}
 
-		if (drawFrame)
+		if (drawFrameFlag)
 			_vm->_graphicsMgr->blitToScreenBuffer(frame, 0, TOP, palette, true);
 	} else {
 		while (lastRect) {