aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2014-01-05 00:04:39 +0100
committerTorbjörn Andersson2014-01-05 00:04:39 +0100
commit9fdb5b45208565c1750ad1bfb2089dbadf4f4660 (patch)
treeb5ad153be29360dff5d3fc64e2834b1bcab824c0
parentd75c4d7f447bc87ff0fcebc7c4abaa4e4f281f22 (diff)
downloadscummvm-rg350-9fdb5b45208565c1750ad1bfb2089dbadf4f4660.tar.gz
scummvm-rg350-9fdb5b45208565c1750ad1bfb2089dbadf4f4660.tar.bz2
scummvm-rg350-9fdb5b45208565c1750ad1bfb2089dbadf4f4660.zip
FULLPIPE: Silence GCC warnings
-rw-r--r--engines/fullpipe/floaters.cpp2
-rw-r--r--engines/fullpipe/motion.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/fullpipe/floaters.cpp b/engines/fullpipe/floaters.cpp
index c1c55fd50c..7ad634f62b 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 8d6fe4a384..42dd60a3aa 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);