[Scummvm-cvs-logs] scummvm master -> 77daa12f85b112c4b5d1182144c71816ae7ea28c

sev- sev at scummvm.org
Thu Sep 19 08:15:47 CEST 2013


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

Summary:
3dbab52fc5 FULLPIPE: Unstubbed MovGraph constructor
38a0c8556f FULLPIPE: Implement startWalkTo()
77daa12f85 FULLPIPE: Fix bug in picture search


Commit: 3dbab52fc564d82bd5eef68d0aaadcc6ad48bfbe
    https://github.com/scummvm/scummvm/commit/3dbab52fc564d82bd5eef68d0aaadcc6ad48bfbe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T23:15:11-07:00

Commit Message:
FULLPIPE: Unstubbed MovGraph constructor

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 022eef8..2332994 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -107,11 +107,16 @@ bool MctlCompoundArray::load(MfcArchive &file) {
 
 int MovGraph_messageHandler(ExCommand *cmd);
 
+int MovGraphCallback(int a1, int a2, int a3) {
+	warning("STUB: MovgraphCallback");
+
+	return 0;
+}
+
 MovGraph::MovGraph() {
-	warning("STUB: MovGraph::MovGraph()");
 	_itemsCount = 0;
 	_items = 0;
-	//_callback1 = MovGraphCallback1;  // TODO
+	_callback1 = MovGraphCallback;
 	_field_44 = 0;
 	insertMessageHandler(MovGraph_messageHandler, getMessageHandlersCount() - 1, 129);
 


Commit: 38a0c8556f24bec7590c4d846640eaf0170f3fa8
    https://github.com/scummvm/scummvm/commit/38a0c8556f24bec7590c4d846640eaf0170f3fa8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T23:15:11-07:00

Commit Message:
FULLPIPE: Implement startWalkTo()

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 2332994..337c181 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -29,6 +29,7 @@
 #include "fullpipe/objects.h"
 #include "fullpipe/motion.h"
 #include "fullpipe/messages.h"
+#include "fullpipe/gameloader.h"
 
 namespace Fullpipe {
 
@@ -285,7 +286,10 @@ void ReactPolygonal::createRegion() {
 }
 
 int startWalkTo(int objId, int objKey, int x, int y, int a5) {
-	warning("STUB: startWalkTo(%d, %d, %d, %d, %d)", objId, objKey, x, y, a5);
+	MctlCompound *mc = getSc2MctlCompoundBySceneId(g_fullpipe->_currentScene->_sceneId);
+
+	if (mc)
+		return (mc->method34(g_fullpipe->_currentScene->getStaticANIObject1ById(objId, objKey), x, y, a5, 0) != 0);
 
 	return 0;
 }


Commit: 77daa12f85b112c4b5d1182144c71816ae7ea28c
    https://github.com/scummvm/scummvm/commit/77daa12f85b112c4b5d1182144c71816ae7ea28c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-18T23:15:11-07:00

Commit Message:
FULLPIPE: Fix bug in picture search

Changed paths:
    engines/fullpipe/scene.cpp



diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 0ea724f..8bae697 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -327,7 +327,7 @@ void Scene::setPictureObjectsFlag4() {
 }
 
 PictureObject *Scene::getPictureObjectById(int objId, int flags) {
-	for (uint i = 0; i < _picObjList.size(); i++) {
+	for (uint i = 1; i < _picObjList.size(); i++) {
 		if (((PictureObject *)_picObjList[i])->_id == objId && ((PictureObject *)_picObjList[i])->_okeyCode == flags)
 			return (PictureObject *)_picObjList[i];
 	}






More information about the Scummvm-git-logs mailing list