[Scummvm-cvs-logs] scummvm master -> 9b3f1c81e8fba4ebac06c1a467c96e23c7e2da56
sev-
sev at scummvm.org
Sun Nov 10 10:42:26 CET 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:
5d8eeda541 FULLPIPE: Fix condition. CID 1109644
3b7f2f7e53 FULLPIPE: Class initialization. CID 1063190
9b3f1c81e8 FULLPIPE: Class init. CID 1099832
Commit: 5d8eeda541e772c7b30203dfbbcb209b96a6edd6
https://github.com/scummvm/scummvm/commit/5d8eeda541e772c7b30203dfbbcb209b96a6edd6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-10T01:20:08-08:00
Commit Message:
FULLPIPE: Fix condition. CID 1109644
Changed paths:
engines/fullpipe/motion.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 2c61330..ffa23cd 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) {
Commit: 3b7f2f7e532d1951afc9a5530f35adbb81ff8916
https://github.com/scummvm/scummvm/commit/3b7f2f7e532d1951afc9a5530f35adbb81ff8916
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-10T01:20:09-08:00
Commit Message:
FULLPIPE: Class initialization. CID 1063190
Changed paths:
engines/fullpipe/statics.cpp
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index e281b9b..445259c 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;
Commit: 9b3f1c81e8fba4ebac06c1a467c96e23c7e2da56
https://github.com/scummvm/scummvm/commit/9b3f1c81e8fba4ebac06c1a467c96e23c7e2da56
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-10T01:23:36-08:00
Commit Message:
FULLPIPE: Class init. CID 1099832
Changed paths:
engines/fullpipe/motion.h
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 7da0c47..b79e66d 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 {
More information about the Scummvm-git-logs
mailing list