aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2014-04-28 20:35:18 +0300
committerEugene Sandulenko2014-04-28 20:35:18 +0300
commit0c1b0cd09738283e2aa68e3db1d5d7535a3eff25 (patch)
tree8130fcfeab8fee146530392f3441564ad27602d3 /engines
parent5a966eef390ef6d8e56bd5afa42ab6871b484417 (diff)
downloadscummvm-rg350-0c1b0cd09738283e2aa68e3db1d5d7535a3eff25.tar.gz
scummvm-rg350-0c1b0cd09738283e2aa68e3db1d5d7535a3eff25.tar.bz2
scummvm-rg350-0c1b0cd09738283e2aa68e3db1d5d7535a3eff25.zip
FULLPIPE: Fix warnings
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/input.cpp4
-rw-r--r--engines/fullpipe/motion.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/fullpipe/input.cpp b/engines/fullpipe/input.cpp
index 3d6f53c7f3..8135eefde3 100644
--- a/engines/fullpipe/input.cpp
+++ b/engines/fullpipe/input.cpp
@@ -303,7 +303,7 @@ void FullpipeEngine::processArcade(ExCommand *cmd) {
int idx;
if (cmd->_sceneClickX <= g_fp->_aniMan2->_ox) {
- for (idx = _arcadeKeys.size() - 1; idx >= 0; idx--) {
+ for (idx = (int)_arcadeKeys.size() - 1; idx >= 0; idx--) {
if (_arcadeKeys[idx]->x < g_fp->_aniMan2->_ox)
break;
}
@@ -311,7 +311,7 @@ void FullpipeEngine::processArcade(ExCommand *cmd) {
if (idx < 0)
return;
} else {
- for (idx = 0; idx < _arcadeKeys.size(); idx++) {
+ for (idx = 0; idx < (int)_arcadeKeys.size(); idx++) {
if (_arcadeKeys[idx]->x > g_fp->_aniMan2->_ox)
break;
}
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index d2eaf0674f..35da154570 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1894,14 +1894,14 @@ MessageQueue *MGM::genMQ(StaticANIObject *ani, int staticsIndex, int staticsId,
startidx = _items[idx]->subItems[subidx]->staticsIndex;
- int step;
+ uint step;
if (_items[idx]->subItems[subidx]->movement->_currMovement)
step = _items[idx]->subItems[subidx]->movement->_currMovement->_dynamicPhases.size();
else
step = _items[idx]->subItems[subidx]->movement->_dynamicPhases.size();
- i++;
+ i += step;
} while (startidx != endidx);
return mq;
@@ -2297,7 +2297,7 @@ int MGM::recalcOffsets(int idx, int st1idx, int st2idx, bool flip, bool flop) {
Common::Point point;
- for (int i = 0; i < item->movements1.size(); i++) {
+ for (uint i = 0; i < item->movements1.size(); i++) {
Movement *mov = item->movements1[i];
if (mov->_staticsObj1 == item->statics[st1idx]) {