[Scummvm-cvs-logs] scummvm master -> 9460116df1a07aa77c316e8127a474dcf203807b

sev- sev at scummvm.org
Wed Jun 4 23:44:03 CEST 2014


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
49cb5ab569 FULLPIPE: Fix warning
9460116df1 FULLPIPE: Fix more warnings


Commit: 49cb5ab569013a213b01ebb3f5781a292ba04452
    https://github.com/scummvm/scummvm/commit/49cb5ab569013a213b01ebb3f5781a292ba04452
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-05T00:40:37+03:00

Commit Message:
FULLPIPE: Fix warning

Changed paths:
    engines/fullpipe/fullpipe.cpp



diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 85a5167..f4444ef 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -514,7 +514,7 @@ void FullpipeEngine::disableSaves(ExCommand *ex) {
 		_isSaveAllowed = false;
 
 		if (_globalMessageQueueList->size() && (*_globalMessageQueueList)[0] != 0) {
-			for (int i = 0; i < _globalMessageQueueList->size(); i++) {
+			for (uint i = 0; i < _globalMessageQueueList->size(); i++) {
 				if ((*_globalMessageQueueList)[i]->_flags & 1)
 					if ((*_globalMessageQueueList)[i]->_id != ex->_parId && !(*_globalMessageQueueList)[i]->_isFinished)
 						return;


Commit: 9460116df1a07aa77c316e8127a474dcf203807b
    https://github.com/scummvm/scummvm/commit/9460116df1a07aa77c316e8127a474dcf203807b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-05T00:43:13+03:00

Commit Message:
FULLPIPE: Fix more warnings

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



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index b643ff9..a7337b9 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 bedfa47..caac6d9 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;






More information about the Scummvm-git-logs mailing list