[Scummvm-git-logs] scummvm master -> 5bda62b12a7216215a3b52c5509f39fd25b13e2f

digitall 547637+digitall at users.noreply.github.com
Sun Jan 12 19:31:47 UTC 2020


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:
5bda62b12a WINTERMUTE: Fix Signed vs. Unsigned Compiler Warnings


Commit: 5bda62b12a7216215a3b52c5509f39fd25b13e2f
    https://github.com/scummvm/scummvm/commit/5bda62b12a7216215a3b52c5509f39fd25b13e2f
Author: D G Turner (digitall at scummvm.org)
Date: 2020-01-12T19:28:27Z

Commit Message:
WINTERMUTE: Fix Signed vs. Unsigned Compiler Warnings

Changed paths:
    engines/wintermute/ad/ad_response_box.cpp


diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index bd4ae50..ecd65be 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -477,7 +477,7 @@ bool AdResponseBox::display() {
 	}
 
 	int xxx, yyy;
-	uint32 i;
+	int32 i;
 
 	xxx = rect.left;
 	yyy = rect.top;
@@ -485,7 +485,7 @@ bool AdResponseBox::display() {
 	// shift down if needed
 	if (!_horizontal) {
 		int totalHeight = 0;
-		for (i = 0; i < _respButtons.size(); i++) {
+		for (i = 0; i < (int32) _respButtons.size(); i++) {
 			totalHeight += (_respButtons[i]->getHeight() + _spacing);
 		}
 		totalHeight -= _spacing;
@@ -512,7 +512,7 @@ bool AdResponseBox::display() {
 
 	// prepare response buttons
 	bool scrollNeeded = false;
-	for (i = _scrollOffset; i < _respButtons.size(); i++) {
+	for (i = _scrollOffset; i < (int32) _respButtons.size(); i++) {
 
 #ifdef ENABLE_FOXTAIL
 		// FoxTail's "HORIZONTAL=TRUE" display boxes are actual 2x3 display boxes
@@ -570,7 +570,7 @@ bool AdResponseBox::display() {
 
 
 	// display response buttons
-	for (i = _scrollOffset; i < _respButtons.size(); i++) {
+	for (i = _scrollOffset; i < (int32) _respButtons.size(); i++) {
 		_respButtons[i]->display();
 	}
 




More information about the Scummvm-git-logs mailing list