[Scummvm-git-logs] scummvm master -> 66d8fca8b38cc8928e21ce30ffae1a05eb02c1b9

sev- sev at scummvm.org
Fri Jun 29 09:37:56 CEST 2018


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

Summary:
7e82e748bf SHERLOCK: Fix shadowing warning
66d8fca8b3 PINK: Fix warnings


Commit: 7e82e748bfbc617d4298cc01fd0d3ac3e7a78592
    https://github.com/scummvm/scummvm/commit/7e82e748bfbc617d4298cc01fd0d3ac3e7a78592
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-06-29T09:37:27+02:00

Commit Message:
SHERLOCK: Fix shadowing warning

Changed paths:
    engines/sherlock/image_file.cpp


diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp
index 5202401..3a97cef 100644
--- a/engines/sherlock/image_file.cpp
+++ b/engines/sherlock/image_file.cpp
@@ -376,14 +376,14 @@ void ImageFile3DO::loadAnimationFile(Common::SeekableReadStream &stream) {
 
 		//
 		// Load data for frame and decompress it
-		byte *data = new byte[celDataSize];
-		stream.read(data, celDataSize);
+		byte *data_ = new byte[celDataSize];
+		stream.read(data_, celDataSize);
 		streamLeft -= celDataSize;
 
 		// always 16 bits per pixel (RGB555)
-		decompress3DOCelFrame(frame, data, celDataSize, 16, NULL);
+		decompress3DOCelFrame(frame, data_, celDataSize, 16, NULL);
 
-		delete[] data;
+		delete[] data_;
 
 		push_back(frame);
 	}


Commit: 66d8fca8b38cc8928e21ce30ffae1a05eb02c1b9
    https://github.com/scummvm/scummvm/commit/66d8fca8b38cc8928e21ce30ffae1a05eb02c1b9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-06-29T09:37:44+02:00

Commit Message:
PINK: Fix warnings

Changed paths:
    engines/pink/director.cpp
    engines/pink/objects/actions/action_loop.cpp
    engines/pink/utils.h


diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp
index bb781a5..b8c9a1b 100644
--- a/engines/pink/director.cpp
+++ b/engines/pink/director.cpp
@@ -82,9 +82,9 @@ void Director::clear() {
 	_sprites.resize(0);
 }
 
-void Director::pause(bool pause) {
+void Director::pause(bool pause_) {
 	for (uint i = 0; i < _sprites.size() ; ++i) {
-		_sprites[i]->pause(pause);
+		_sprites[i]->pause(pause_);
 	}
 }
 
diff --git a/engines/pink/objects/actions/action_loop.cpp b/engines/pink/objects/actions/action_loop.cpp
index c54d06f..09bea7c 100644
--- a/engines/pink/objects/actions/action_loop.cpp
+++ b/engines/pink/objects/actions/action_loop.cpp
@@ -55,7 +55,7 @@ void ActionLoop::toConsole() {
 
 void ActionLoop::update() {
 	ActionCEL::update();
-	int frame = _decoder.getCurFrame();
+	uint frame = _decoder.getCurFrame();
 
 	if (!_inLoop) {
 		if (frame < _startFrame) {
diff --git a/engines/pink/utils.h b/engines/pink/utils.h
index d55b8d9..2cd8719 100644
--- a/engines/pink/utils.h
+++ b/engines/pink/utils.h
@@ -31,9 +31,9 @@ template <typename T>
 class Array : public Common::Array<T>, public Object {
 public:
 	void deserialize(Archive &archive) {
-		uint size = archive.readWORD();
-		this->resize(size);
-		for (uint i = 0; i < size; ++i) {
+		uint size_ = archive.readWORD();
+		this->resize(size_);
+		for (uint i = 0; i < size_; ++i) {
 			this->data()[i] = reinterpret_cast<T>(archive.readObject()); // dynamic_cast needs to know complete type
 		}
 	}
@@ -42,9 +42,9 @@ public:
 class StringArray : public Common::StringArray {
 public:
 	void deserialize(Archive &archive) {
-		uint32 size = archive.readWORD();
-		this->resize(size);
-		for (uint i = 0; i < size; ++i) {
+		uint32 size_ = archive.readWORD();
+		this->resize(size_);
+		for (uint i = 0; i < size_; ++i) {
 			this->data()[i] = archive.readString();
 		}
 	}
@@ -61,8 +61,8 @@ public:
 	}
 
 	void deserialize(Archive &archive) {
-		uint size = archive.readWORD();
-		for (uint i = 0; i < size; ++i) {
+		uint size_ = archive.readWORD();
+		for (uint i = 0; i < size_; ++i) {
 			Common::String key = archive.readString();
 			Common::String val = archive.readString();
 			setVal(key, val);





More information about the Scummvm-git-logs mailing list