diff options
author | Eugene Sandulenko | 2014-06-05 00:43:13 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2014-06-05 00:43:13 +0300 |
commit | 9460116df1a07aa77c316e8127a474dcf203807b (patch) | |
tree | bc049e2e3ae877b62f88463eeafa5384d3793c14 | |
parent | 49cb5ab569013a213b01ebb3f5781a292ba04452 (diff) | |
download | scummvm-rg350-9460116df1a07aa77c316e8127a474dcf203807b.tar.gz scummvm-rg350-9460116df1a07aa77c316e8127a474dcf203807b.tar.bz2 scummvm-rg350-9460116df1a07aa77c316e8127a474dcf203807b.zip |
FULLPIPE: Fix more warnings
-rw-r--r-- | engines/fullpipe/messages.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/motion.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp index b643ff9b8f..a7337b98ed 100644 --- a/engines/fullpipe/messages.cpp +++ b/engines/fullpipe/messages.cpp @@ -397,7 +397,7 @@ void MessageQueue::update() { void MessageQueue::messageQueueCallback1(int par) { if (g_fp->_isSaveAllowed && par == 16) { if (g_fp->_globalMessageQueueList->size() && (*g_fp->_globalMessageQueueList)[0] != 0) { - for (int i = 0; i < g_fp->_globalMessageQueueList->size(); i++) { + for (uint i = 0; i < g_fp->_globalMessageQueueList->size(); i++) { if ((*g_fp->_globalMessageQueueList)[i]->_flags & 1) if ((*g_fp->_globalMessageQueueList)[i] != this && !(*g_fp->_globalMessageQueueList)[i]->_isFinished) return; diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index bedfa47ff7..caac6d9e5a 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -345,7 +345,7 @@ void MctlLadder::addObject(StaticANIObject *obj) { } int MctlLadder::findObjectPos(StaticANIObject *obj) { - for (int i = 0; i < _ladmovements.size(); i++) + for (uint i = 0; i < _ladmovements.size(); i++) if (_ladmovements[i]->objId == obj->_id) return i; @@ -399,7 +399,7 @@ bool MctlLadder::initMovement(StaticANIObject *ani, MctlLadderMovement *movement void MctlLadder::freeItems() { _mgm.clear(); - for (int i = 0; i < _ladmovements.size(); i++) { + for (uint i = 0; i < _ladmovements.size(); i++) { delete _ladmovements[i]->movVars; delete[] _ladmovements[i]->staticIds; } @@ -630,7 +630,7 @@ MctlConnectionPoint *MctlCompound::findClosestConnectionPoint(int ox, int oy, in MctlConnectionPoint *minConnectionPoint = 0; for (uint i = 0; i < _motionControllers[sourceIdx]->_connectionPoints.size(); i++) { - for (int j = 0; j < _motionControllers.size(); j++) { + for (uint j = 0; j < _motionControllers.size(); j++) { if (_motionControllers[j]->_movGraphReactObj) { MctlConnectionPoint *pt = _motionControllers[sourceIdx]->_connectionPoints[i]; @@ -823,7 +823,7 @@ Common::Array<MovItem *> *MovGraph::method28(StaticANIObject *ani, int x, int y, if (_items.size() <= 0) return 0; - int idx = 0; + uint idx = 0; while (_items[idx]->ani != ani) { idx++; @@ -859,7 +859,7 @@ Common::Array<MovItem *> *MovGraph::method28(StaticANIObject *ani, int x, int y, Common::Array<MovItem *> *movitems = calcMovItems(&_items[idx]->movarr, (*movarr)[i], &sz); if (sz > 0) { - for (uint j = 0; j < sz; j++) + for (int j = 0; j < sz; j++) _items[idx]->movitems->push_back(movitems[j]); delete movitems; |