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

[sev-]

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:
ec0d06e269 FULLPIPE: Attempt to fix flickering. Added debug output


Commit: ec0d06e269eb2489a38ea92f0f88d9ada21bef0b
    https://github.com/scummvm/scummvm/commit/ec0d06e269eb2489a38ea92f0f88d9ada21bef0b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-27T18:51:17+03:00

Commit Message:
FULLPIPE: Attempt to fix flickering. Added debug output

Changed paths:
    engines/fullpipe/scene.cpp



diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index f39ae4e..8463b3a 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -485,7 +485,15 @@ void Scene::objectList_sortByPriority(Common::Array<StaticANIObject *> &list, bo
 }
 
 void Scene::objectList_sortByPriority(Common::Array<PictureObject *> &list, bool skipFirst) {
-	Common::sort(list.begin(), list.end(), Scene::compareObjPriority);
+	if (skipFirst) {
+		Common::Array<PictureObject *>::iterator s = list.begin();
+
+		++s;
+
+		Common::sort(s, list.end(), Scene::compareObjPriority);
+	} else {
+		Common::sort(list.begin(), list.end(), Scene::compareObjPriority);
+	}
 }
 
 void Scene::draw() {
@@ -646,7 +654,7 @@ void Scene::drawContent(int minPri, int maxPri, bool drawBg) {
 		g_fp->_globalPalette = _palette->_data;
 	}
 
-	debug(8, "Scene::drawContent(>%d, <%d, %d)", minPri, maxPri, drawBg);
+	debug(1, "Scene::drawContent(>%d, <%d, %d)", minPri, maxPri, drawBg);
 
 	if (_picObjList.size() > 2) { // We need to z-sort them
 		objectList_sortByPriority(_picObjList, true);
@@ -658,11 +666,17 @@ void Scene::drawContent(int minPri, int maxPri, bool drawBg) {
 	if (maxPri == -1)
 		maxPri = 60000;
 
-	debug(8, "-> Scene::drawContent(>%d, <%d, %d)", minPri, maxPri, drawBg);
+	debug(1, "-> Scene::drawContent(>%d, <%d, %d)", minPri, maxPri, drawBg);
 
 	Common::Point point;
 
-	debug(8, "_bigPict: %d objlist: %d", _bigPictureArray1Count, _picObjList.size());
+	debug(1, "_bigPict: %d objlist: %d", _bigPictureArray1Count, _picObjList.size());
+
+	for (uint i = 0; i < _picObjList.size(); i++) {
+		debug(1, "%d: %d", i, ((PictureObject *)_picObjList[i])->_priority);
+	}
+
+
 	if (drawBg && _bigPictureArray1Count && _picObjList.size()) {
 
 		_bigPictureArray[0][0]->getDimensions(&point);