[Scummvm-cvs-logs] scummvm master -> 0c1b0cd09738283e2aa68e3db1d5d7535a3eff25
sev-
sev at scummvm.org
Mon Apr 28 19:36:14 CEST 2014
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:
0c1b0cd097 FULLPIPE: Fix warnings
Commit: 0c1b0cd09738283e2aa68e3db1d5d7535a3eff25
https://github.com/scummvm/scummvm/commit/0c1b0cd09738283e2aa68e3db1d5d7535a3eff25
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-28T20:35:18+03:00
Commit Message:
FULLPIPE: Fix warnings
Changed paths:
engines/fullpipe/input.cpp
engines/fullpipe/motion.cpp
diff --git a/engines/fullpipe/input.cpp b/engines/fullpipe/input.cpp
index 3d6f53c..8135eef 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 d2eaf06..35da154 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]) {
More information about the Scummvm-git-logs
mailing list