aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe
diff options
context:
space:
mode:
Diffstat (limited to 'engines/fullpipe')
-rw-r--r--engines/fullpipe/motion.cpp2
-rw-r--r--engines/fullpipe/motion.h2
-rw-r--r--engines/fullpipe/statics.cpp3
3 files changed, 5 insertions, 2 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 2c61330ea1..ffa23cd071 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1146,7 +1146,7 @@ int MovGraph2::findLink(Common::Array<MovGraphLink *> *linkList, int idx, Common
} else if (idx != (int)(linkList->size() - 1)) {
MovGraphLink *lnk = (*linkList)[idx + 1];
- if (lnk->_movGraphNode1 == node1 || lnk->_movGraphNode1 == node1) {
+ if (lnk->_movGraphNode2 == node1 || lnk->_movGraphNode1 == node1) {
node3 = node2;
node2 = node1;
} else if (lnk->_movGraphNode2 == node2 || lnk->_movGraphNode1 == node2) {
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 7da0c47fb2..b79e66decb 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -87,7 +87,7 @@ class MctlCompoundArrayItem : public CObject {
int _field_28;
public:
- MctlCompoundArrayItem() : _movGraphReactObj(0) {}
+ MctlCompoundArrayItem() : _movGraphReactObj(0), _motionControllerObj(0), _field_20(0), _field_24(0), _field_28(0) {}
};
class MctlCompoundArray : public Common::Array<MctlCompoundArrayItem *>, public CObject {
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index e281b9bbfb..445259c8f5 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1219,6 +1219,9 @@ Movement::Movement(Movement *src, int *oldIdxs, int newSize, StaticANIObject *an
_currDynamicPhaseIndex = 0;
_field_94 = 0;
+ _field_24 = 0;
+ _field_28 = 0;
+
_field_50 = src->_field_50;
_flipFlag = src->_flipFlag;
_currMovement = 0;