[Scummvm-cvs-logs] scummvm master -> 230e7713217603de711cf098977daba108cb3087

[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:
df0d8bf874 FULLPIPE: Pushed noisy debug message deeper
230e771321 FULLPIPE: Implement MovGraph::doWalkTo()


Commit: df0d8bf8746436dcc3ca79829e77aa8e08205884
    https://github.com/scummvm/scummvm/commit/df0d8bf8746436dcc3ca79829e77aa8e08205884
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-14T12:34:46+02:00

Commit Message:
FULLPIPE: Pushed noisy debug message deeper

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index a796665..b6b312a 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1276,7 +1276,7 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase
 	if (_flags & 0x80)
 		return false;
 
-	debug(0, "StaticANIObject::startAnim(%d, %d, %d) (%s [%d]) [%d, %d]", movementId, messageQueueId, dynPhaseIdx, transCyrillic((byte *)_objectName), _id, _ox, _oy);
+	debug(4, "StaticANIObject::startAnim(%d, %d, %d) (%s [%d]) [%d, %d]", movementId, messageQueueId, dynPhaseIdx, transCyrillic((byte *)_objectName), _id, _ox, _oy);
 
 	if (_messageQueueId) {
 		updateGlobalMessageQueue(messageQueueId, _id);


Commit: 230e7713217603de711cf098977daba108cb3087
    https://github.com/scummvm/scummvm/commit/230e7713217603de711cf098977daba108cb3087
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-15T12:34:55+02:00

Commit Message:
FULLPIPE: Implement MovGraph::doWalkTo()

Changed paths:
    engines/fullpipe/gfx.cpp
    engines/fullpipe/motion.cpp
    engines/fullpipe/motion.h



diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index b4eba44..520e818 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -398,6 +398,7 @@ bool GameObject::getPicAniInfo(PicAniInfo *info) {
 		info->ox = _ox;
 		info->oy = _oy;
 		info->priority = _priority;
+		warning("Yep %d", _id);
 
 		return true;
 	}
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index b9fdc43..b5e0f67 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -628,7 +628,6 @@ int MovGraph::method44() {
 }
 
 MessageQueue *MovGraph::doWalkTo(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId) {
-#if 0
 	PicAniInfo picAniInfo;
 	int ss;
 
@@ -641,7 +640,7 @@ MessageQueue *MovGraph::doWalkTo(StaticANIObject *subj, int xpos, int ypos, int
 		int idx = getItemIndexByStaticAni(subj);
 
 		for (uint i = 0; i < _items[idx]->count; i++) {
-			if (_items[idx]->items[i].movarr == goal) {
+			if ((*_items[idx]->items[i].movarr)[0] == goal) {
 				if (subj->_movement) {
 					Common::Point point;
 
@@ -671,7 +670,7 @@ MessageQueue *MovGraph::doWalkTo(StaticANIObject *subj, int xpos, int ypos, int
 		if (_items[idx]->count > 0) {
 			int arridx = 0;
 
-			while (_items[idx]->items[arridx].movarr != goal) {
+			while ((*_items[idx]->items[arridx].movarr)[0] != goal) {
 				arridx++;
 
 				if (arridx >= _items[idx]->count) {
@@ -682,16 +681,16 @@ MessageQueue *MovGraph::doWalkTo(StaticANIObject *subj, int xpos, int ypos, int
 
 			_items[idx]->movarr->clear();
 
-			for (uint i = 0; i < _items[idx]->items[arridx].movarr->_movStepCount; i++) {
+			for (uint i = 0; i < (*_items[idx]->items[arridx].movarr)[i]->_movStepCount; i++) {
 				MovArr *m = new MovArr;
 
-				*m = *_items[idx]->items[arridx].movarr[i];
+				*m = *(*_items[idx]->items[arridx].movarr)[i];
 			}
 
 			_items[idx]->field_10 = -1;
 			_items[idx]->field_14 = 0;
 
-			MessageQueue *mq = fillMGMinfo(_items[idx]->ani, _items[idx]->movarr, staticsId);
+			MessageQueue *mq = fillMGMinfo(_items[idx]->ani, (*_items[idx]->movarr)[0], staticsId);
 			if (mq) {
 				ExCommand *ex = new ExCommand();
 				ex->_messageKind = 17;
@@ -709,10 +708,6 @@ MessageQueue *MovGraph::doWalkTo(StaticANIObject *subj, int xpos, int ypos, int
 	subj->setPicAniInfo(&picAniInfo);
 
 	return 0;
-#endif
-	warning("STUB: MovGraph::doWalkTo()");
-
-	return 0;
 }
 
 MessageQueue *MovGraph::sub1(StaticANIObject *ani, int x, int y, int a5, int x1, int y1, int a8, int a9) {
@@ -1517,6 +1512,8 @@ MessageQueue *MovGraph2::doWalkTo(StaticANIObject *obj, int xpos, int ypos, int
 
 	obj->getPicAniInfo(&picAniInfo);
 
+	warning("p: %d %d", picAniInfo.movementId, picAniInfo.objectId);
+
 	int idxsub;
 
 	if (obj->_movement)
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 3ef62a7..1b49839 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -315,7 +315,7 @@ struct MovArr {
 };
 
 struct MovItem {
-	MovArr *movarr;
+	Common::Array<MovArr *> *movarr;
 	int _mfield_4;
 	int _mfield_8;
 	int _mfield_C;