[Scummvm-cvs-logs] scummvm master -> 9fdb5b45208565c1750ad1bfb2089dbadf4f4660

[eriktorbjorn]

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:
9fdb5b4520 FULLPIPE: Silence GCC warnings


Commit: 9fdb5b45208565c1750ad1bfb2089dbadf4f4660
    https://github.com/scummvm/scummvm/commit/9fdb5b45208565c1750ad1bfb2089dbadf4f4660
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-01-04T15:04:39-08:00

Commit Message:
FULLPIPE: Silence GCC warnings

Changed paths:
    engines/fullpipe/floaters.cpp
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/floaters.cpp b/engines/fullpipe/floaters.cpp
index c1c55fd..7ad634f 100644
--- a/engines/fullpipe/floaters.cpp
+++ b/engines/fullpipe/floaters.cpp
@@ -127,7 +127,7 @@ void Floaters::genFlies(Scene *sc, int x, int y, int priority, int flags) {
 }
 
 void Floaters::update() {
-	for (int i = 0; i < _array2.size(); ++i) {
+	for (uint i = 0; i < _array2.size(); ++i) {
 		if (_array2[i]->val13 <= 0) {
 			if (_array2[i]->val4 != _array2[i]->val2 || _array2[i]->val5 != _array2[i]->val3) {
 				if (_array2[i]->val9 < 2.0)
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 8d6fe4a..42dd60a 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1914,7 +1914,7 @@ ExCommand2 *MGM::buildExCommand2(Movement *mov, int objId, int x1, int y1, Commo
 	else
 		cnt = mov->_dynamicPhases.size();
 
-	if (len > 0 && cnt > len)
+	if (len > 0 && cnt > (uint)len)
 		cnt = len;
 
 	Common::Point **points = (Common::Point **)malloc(sizeof(Common::Point *) * cnt);
@@ -1950,7 +1950,7 @@ ExCommand2 *MGM::buildExCommand2(Movement *mov, int objId, int x1, int y1, Commo
 	ex->_field_24 = 1;
 	ex->_keyCode = -1;
 
-	for (int i = 0; i < cnt; i++)
+	for (uint i = 0; i < cnt; i++)
 		delete points[i];
 
 	free(points);