[Scummvm-git-logs] scummvm master -> 696b6cd723ffedb588d23d130c9fff60730bf21f

[sev-]

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

Summary:
5071d86a28 DRAGONS: Fix compiler warning
25e9e9ea71 DRAGONS: Fix compiler warning
f7bec53f89 DRAGONS: Fix compiler warning
696b6cd723 DRAGONS: Fix compiler warnings


Commit: 5071d86a281f8ae674b07122c0f5109a39cba9ab
    https://github.com/scummvm/scummvm/commit/5071d86a281f8ae674b07122c0f5109a39cba9ab
Author: jepael (jepael at users.noreply.github.com)
Date: 2020-02-26T10:54:11+01:00

Commit Message:
DRAGONS: Fix compiler warning

Changed paths:
    engines/dragons/dragonflg.cpp


diff --git a/engines/dragons/dragonflg.cpp b/engines/dragons/dragonflg.cpp
index 75768829cd..ce51d8ea1f 100644
--- a/engines/dragons/dragonflg.cpp
+++ b/engines/dragons/dragonflg.cpp
@@ -87,7 +87,7 @@ void Properties::save(uint numberToWrite, Common::WriteStream *out) {
 
 void Properties::print(char *prefix) {
 	char *str = new char[_count + 1];
-	int i = 0;
+	uint i = 0;
 	for (; i < _count; i++) {
 		str[i] = get(i) ? '1' : '0';
 	}


Commit: 25e9e9ea71ea89af7c4dd5493f7588c8d30290ec
    https://github.com/scummvm/scummvm/commit/25e9e9ea71ea89af7c4dd5493f7588c8d30290ec
Author: jepael (jepael at users.noreply.github.com)
Date: 2020-02-26T10:54:11+01:00

Commit Message:
DRAGONS: Fix compiler warning

Changed paths:
    engines/dragons/talk.cpp


diff --git a/engines/dragons/talk.cpp b/engines/dragons/talk.cpp
index 0606d5a682..9ccee91927 100644
--- a/engines/dragons/talk.cpp
+++ b/engines/dragons/talk.cpp
@@ -506,7 +506,7 @@ void Talk::displayDialogAroundActor(Actor *actor, uint16 param_2, uint16 *dialog
 }
 
 void Talk::copyTextToBuffer(uint16 *destBuffer, byte *src, uint32 destBufferLength) {
-	for (int i = 0; i < destBufferLength - 1; i++) {
+	for (uint i = 0; i < destBufferLength - 1; i++) {
 		destBuffer[i] = READ_LE_UINT16(src);
 		src += 2;
 		if (destBuffer[i] == 0) {


Commit: f7bec53f898251fee502817bbeef376ba85f59be
    https://github.com/scummvm/scummvm/commit/f7bec53f898251fee502817bbeef376ba85f59be
Author: jepael (jepael at users.noreply.github.com)
Date: 2020-02-26T10:54:11+01:00

Commit Message:
DRAGONS: Fix compiler warning

Changed paths:
    engines/dragons/scene.cpp


diff --git a/engines/dragons/scene.cpp b/engines/dragons/scene.cpp
index 3afb296d2a..03a193aabe 100644
--- a/engines/dragons/scene.cpp
+++ b/engines/dragons/scene.cpp
@@ -480,7 +480,7 @@ void Scene::drawActorNumber(int16 x, int16 y, uint16 actorId) {
 
 	sprintf(text8, "%d", actorId);
 
-	for (int i = 0; i < strlen(text8); i++) {
+	for (uint i = 0; i < strlen(text8); i++) {
 		text[i] = text8[i];
 	}
 	_vm->_fontManager->addText(x, y, text, strlen(text8), 1);


Commit: 696b6cd723ffedb588d23d130c9fff60730bf21f
    https://github.com/scummvm/scummvm/commit/696b6cd723ffedb588d23d130c9fff60730bf21f
Author: jepael (jepael at users.noreply.github.com)
Date: 2020-02-26T10:54:11+01:00

Commit Message:
DRAGONS: Fix compiler warnings

Changed paths:
    engines/dragons/font.cpp


diff --git a/engines/dragons/font.cpp b/engines/dragons/font.cpp
index c65472571a..f59a0da2f3 100644
--- a/engines/dragons/font.cpp
+++ b/engines/dragons/font.cpp
@@ -37,7 +37,7 @@ Font::Font(Common::SeekableReadStream &stream, uint32 mapSize, uint32 pixelOffse
 		error("Allocating memory for font map.");
 	}
 
-	for (int i = 0; i < _size; i++) {
+	for (uint i = 0; i < _size; i++) {
 		_map[i] = stream.readUint16LE();
 	}
 
@@ -215,18 +215,18 @@ void FontManager::drawTextDialogBox(uint32 x1, uint32 y1, uint32 x2, uint32 y2)
 	const uint16 kTileIndexBottomLeft = kTileBaseIndex + 15;
 	const uint16 kTileIndexBottomRight = kTileBaseIndex + 17;
 	// Fill background
-	for (int yc = y1 + 1; yc <= y2 - 1; ++yc) {
-		for (int xc = x1 + 1; xc <= x2 - 1; ++xc) {
+	for (uint yc = y1 + 1; yc <= y2 - 1; ++yc) {
+		for (uint xc = x1 + 1; xc <= x2 - 1; ++xc) {
 			drawBoxChar(xc, yc, kTileIndexBackground);
 		}
 	}
 	// Fill top and bottom rows
-	for (int xc = x1 + 1; xc <= x2 - 1; ++xc) {
+	for (uint xc = x1 + 1; xc <= x2 - 1; ++xc) {
 		drawBoxChar(xc, y1, kTileIndexTop);
 		drawBoxChar(xc, y2, kTileIndexBottom);
 	}
 	// Fill left and right columns
-	for (int yc = y1 + 1; yc <= y2 - 1; ++yc) {
+	for (uint yc = y1 + 1; yc <= y2 - 1; ++yc) {
 		drawBoxChar(x1, yc, kTileIndexLeft);
 		drawBoxChar(x2, yc, kTileIndexRight);
 	}