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

[sev-]

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

Summary:
ec08412925 SCI: Fix shadowing warning
19e3e229b6 SHERLOCK: Fix warning
a6d900db88 SUPERNOVA: Fix warning


Commit: ec084129259e41f8e37e84424b951329d37a02af
    https://github.com/scummvm/scummvm/commit/ec084129259e41f8e37e84424b951329d37a02af
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-06-29T09:14:17+02:00

Commit Message:
SCI: Fix shadowing warning

Changed paths:
    engines/sci/engine/segment.h


diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h
index 14744e3..9a921d6 100644
--- a/engines/sci/engine/segment.h
+++ b/engines/sci/engine/segment.h
@@ -508,11 +508,11 @@ public:
 	 * Returns the maximum number of bytes that can be stored in the array.
 	 */
 	uint16 byteSize() const {
-		uint16 size = _size;
+		uint16 size1 = _size;
 		if (_type == kArrayTypeID || _type == kArrayTypeInt16) {
-			size *= sizeof(uint16);
+			size1 *= sizeof(uint16);
 		}
-		return size;
+		return size1;
 	}
 
 	/**


Commit: 19e3e229b60395e126827db78833bbad0c8b61f9
    https://github.com/scummvm/scummvm/commit/19e3e229b60395e126827db78833bbad0c8b61f9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-06-29T09:14:17+02:00

Commit Message:
SHERLOCK: Fix warning

Changed paths:
    engines/sherlock/image_file.cpp


diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp
index 1126556..5202401 100644
--- a/engines/sherlock/image_file.cpp
+++ b/engines/sherlock/image_file.cpp
@@ -93,11 +93,11 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool
 		}
 
 		// Load data for frame and decompress it
-		byte *data = new byte[frame._size + 4];
-		stream.read(data, frame._size);
-		Common::fill(data + frame._size, data + frame._size + 4, 0);
-		frame.decompressFrame(data, IS_ROSE_TATTOO);
-		delete[] data;
+		byte *data1 = new byte[frame._size + 4];
+		stream.read(data1, frame._size);
+		Common::fill(data1 + frame._size, data1 + frame._size + 4, 0);
+		frame.decompressFrame(data1, IS_ROSE_TATTOO);
+		delete[] data1;
 
 		push_back(frame);
 	}


Commit: a6d900db88a4346a677006af33426effbc7a9c30
    https://github.com/scummvm/scummvm/commit/a6d900db88a4346a677006af33426effbc7a9c30
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-06-29T09:14:17+02:00

Commit Message:
SUPERNOVA: Fix warning

Changed paths:
    engines/supernova/state.cpp


diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index f50d665..fa53b5e 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -247,8 +247,8 @@ void GuiElement::setColor(int bgColor, int textColor, int bgColorHighlighted, in
 	_textColorHighlighted = textColorHightlighted;
 }
 
-void GuiElement::setHighlight(bool isHighlighted) {
-	if (isHighlighted) {
+void GuiElement::setHighlight(bool isHighlighted_) {
+	if (isHighlighted_) {
 		_bgColor = _bgColorHighlighted;
 		_textColor = _textColorHighlighted;
 	} else {