From 66d8fca8b38cc8928e21ce30ffae1a05eb02c1b9 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 29 Jun 2018 09:37:44 +0200
Subject: PINK: Fix warnings

---
 engines/pink/director.cpp                    |  4 ++--
 engines/pink/objects/actions/action_loop.cpp |  2 +-
 engines/pink/utils.h                         | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'engines/pink')

diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp
index bb781a5c27..b8c9a1bbca 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 c54d06fac3..09bea7c6ec 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 d55b8d95ce..2cd8719175 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);
-- 
cgit v1.2.3