[Scummvm-git-logs] scummvm master -> 590262a3c652eae81536194be274a277dccc63bc

[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:
590262a3c6 PETKA: Fix GCC Warnings in Object Text Classes


Commit: 590262a3c652eae81536194be274a277dccc63bc
    https://github.com/scummvm/scummvm/commit/590262a3c652eae81536194be274a277dccc63bc
Author: D G Turner (digitall at scummvm.org)
Date: 2020-05-18T07:21:12+01:00

Commit Message:
PETKA: Fix GCC Warnings in Object Text Classes

Changed paths:
    engines/petka/objects/text.cpp
    engines/petka/objects/text.h


diff --git a/engines/petka/objects/text.cpp b/engines/petka/objects/text.cpp
index 98cd52d520..5a86ffa866 100644
--- a/engines/petka/objects/text.cpp
+++ b/engines/petka/objects/text.cpp
@@ -61,8 +61,8 @@ const Common::Rect &QText::getRect() {
 }
 
 void QText::drawOutline(Graphics::Surface *s, uint16 color) {
-	for (uint y = 0; y < s->h; ++y) {
-		for (uint x = 1; x < s->w - 1; ++x) {
+	for (int y = 0; y < s->h; ++y) {
+		for (int x = 1; x < s->w - 1; ++x) {
 			uint16 *pixel = (uint16 *)s->getBasePtr(x, y);
 			if (*pixel && *pixel != color) {
 				if (!pixel[-1])
@@ -73,8 +73,8 @@ void QText::drawOutline(Graphics::Surface *s, uint16 color) {
 		}
 	}
 
-	for (uint x = 0; x < s->w; ++x) {
-		for (uint y = 0; y < s->h - 1; ++y) {
+	for (int x = 0; x < s->w; ++x) {
+		for (int y = 0; y < s->h - 1; ++y) {
 			uint16 *pixel = (uint16 *)s->getBasePtr(x, y);
 			if (*pixel && *pixel != color) {
 				pixel = (uint16 *)s->getBasePtr(x, y - 1);
diff --git a/engines/petka/objects/text.h b/engines/petka/objects/text.h
index c0030370fc..d686c2129e 100644
--- a/engines/petka/objects/text.h
+++ b/engines/petka/objects/text.h
@@ -59,7 +59,7 @@ public:
 
 private:
 	Common::U32String _phrase;
-	int _time;
+	uint _time;
 };
 
 class QTextDescription : public QText {