[Scummvm-cvs-logs] scummvm master -> c1890cc739d94c4310ec8933b8fca3f43b8df294

[sev-]

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:
9f31278d18 FULLPIPE: Fix warnings
c1890cc739 FULLPIPE: Fix warnings


Commit: 9f31278d187d7f3e92fe596c64fcf8cf15292342
    https://github.com/scummvm/scummvm/commit/9f31278d187d7f3e92fe596c64fcf8cf15292342
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-20T08:14:27+03:00

Commit Message:
FULLPIPE: Fix warnings

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index be27b7c..0b1c159 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -735,7 +735,7 @@ MessageQueue *MovGraph::doWalkTo(StaticANIObject *subj, int xpos, int ypos, int
 		Common::Array<MovArr *> *goal = _callback1(subj, movitem, ss);
 		int idx = getItemIndexByStaticAni(subj);
 
-		for (uint i = 0; i < _items[idx]->count; i++) {
+		for (int i = 0; i < _items[idx]->count; i++) {
 			if (_items[idx]->movitems->operator[](i)->movarr == goal) {
 				if (subj->_movement) {
 					Common::Point point;
@@ -777,7 +777,7 @@ MessageQueue *MovGraph::doWalkTo(StaticANIObject *subj, int xpos, int ypos, int
 
 			_items[idx]->movarr->clear();
 
-			for (uint i = 0; i < (*_items[idx]->movitems->operator[](arridx)->movarr)[i]->_movStepCount; i++) {
+			for (int i = 0; i < (*_items[idx]->movitems->operator[](arridx)->movarr)[i]->_movStepCount; i++) {
 				MovArr *m = new MovArr;
 
 				*m = *(*_items[idx]->movitems->operator[](arridx)->movarr)[i];


Commit: c1890cc739d94c4310ec8933b8fca3f43b8df294
    https://github.com/scummvm/scummvm/commit/c1890cc739d94c4310ec8933b8fca3f43b8df294
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-20T08:15:30+03:00

Commit Message:
FULLPIPE: Fix warnings

Changed paths:
    engines/fullpipe/scene.cpp



diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 2a78454..1247d93 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -139,12 +139,12 @@ Scene::~Scene() {
 
 	// _faObjlist is not used
 
-	for (int i = 0; i < _messageQueueList.size(); i++)
+	for (uint i = 0; i < _messageQueueList.size(); i++)
 		delete _messageQueueList[i];
 
 	_messageQueueList.clear();
 
-	for (int i = 0; i < _staticANIObjectList1.size(); i++)
+	for (uint i = 0; i < _staticANIObjectList1.size(); i++)
 		delete _staticANIObjectList1[i];
 
 	_staticANIObjectList1.clear();
@@ -287,7 +287,7 @@ void Scene::init() {
 	if (_staticANIObjectList2.size() != _staticANIObjectList1.size()) {
 		_staticANIObjectList2.clear();
 
-		for (int i = 0; i < _staticANIObjectList1.size(); i++)
+		for (uint i = 0; i < _staticANIObjectList1.size(); i++)
 			_staticANIObjectList2.push_back(_staticANIObjectList1[i]);
 	}
 }
@@ -353,7 +353,7 @@ void Scene::setPictureObjectsFlag4() {
 }
 
 void Scene::stopAllSounds() {
-	for (uint i = 0; i < _soundList->getCount(); i++)
+	for (int i = 0; i < _soundList->getCount(); i++)
 		_soundList->getSoundByIndex(i)->stop();
 }
 
@@ -507,11 +507,11 @@ void Scene::draw() {
 
 	objectList_sortByPriority(_staticANIObjectList2);
 
-	for (int i = 0; i < _staticANIObjectList2.size(); i++)
+	for (uint i = 0; i < _staticANIObjectList2.size(); i++)
 		_staticANIObjectList2[i]->draw2();
 
 	int priority = -1;
-	for (int i = 0; i < _staticANIObjectList2.size(); i++) {
+	for (uint i = 0; i < _staticANIObjectList2.size(); i++) {
 		drawContent(_staticANIObjectList2[i]->_priority, priority, false);
 		_staticANIObjectList2[i]->draw();
 
@@ -642,7 +642,7 @@ int Scene::getPictureObjectIdAtPos(int x, int y) {
 void Scene::update(int counterdiff) {
 	debug(6, "Scene::update(%d)", counterdiff);
 
-	for (int i = 0; i < _staticANIObjectList2.size(); i++)
+	for (uint i = 0; i < _staticANIObjectList2.size(); i++)
 		_staticANIObjectList2[i]->update(counterdiff);
 }