[Scummvm-cvs-logs] scummvm master -> 8fc73ea0c541391ce7352d7cd0aba0ff320405a7
sev-
sev at scummvm.org
Thu May 1 13:24:47 CEST 2014
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:
b031373ba7 FULLPIPE: Implement MctlCompound::removeObject()
f18ad22d22 FULLPIPE: Implement MctlCompound::replaceNodeX()
8fc73ea0c5 FULLPIPE: Implement MovGraphLink::~MovGraphLink()
Commit: b031373ba7fe7515311e1c7528e566ecbe4668cc
https://github.com/scummvm/scummvm/commit/b031373ba7fe7515311e1c7528e566ecbe4668cc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-01T12:18:18+03:00
Commit Message:
FULLPIPE: Implement MctlCompound::removeObject()
Changed paths:
engines/fullpipe/motion.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 35da154..d8fa24c 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -125,9 +125,10 @@ void MctlCompound::addObject(StaticANIObject *obj) {
}
int MctlCompound::removeObject(StaticANIObject *obj) {
- warning("STUB: MctlCompound::removeObject()");
+ for (uint i = 0; i < _motionControllers.size(); i++)
+ _motionControllers[i]->_motionControllerObj->removeObject(obj);
- return 0;
+ return 1;
}
void MctlCompound::initMovGraph2() {
Commit: f18ad22d22cd220a1f1f8ed46d279fc45402b2ff
https://github.com/scummvm/scummvm/commit/f18ad22d22cd220a1f1f8ed46d279fc45402b2ff
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-01T12:28:17+03:00
Commit Message:
FULLPIPE: Implement MctlCompound::replaceNodeX()
Changed paths:
engines/fullpipe/motion.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index d8fa24c..84f09ef 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -435,7 +435,20 @@ MctlConnectionPoint *MctlCompound::findClosestConnectionPoint(int ox, int oy, in
}
void MctlCompound::replaceNodeX(int from, int to) {
- warning("STUB: MctlCompound::replaceNodeX()");
+ for (uint i = 0; i < _motionControllers.size(); i++) {
+ if (_motionControllers[i]->_motionControllerObj->_objtype == kObjTypeMovGraph) {
+ MovGraph *gr = (MovGraph *)_motionControllers[i]->_motionControllerObj;
+
+ for (ObList::iterator n = gr->_nodes.begin(); n != gr->_nodes.end(); ++n) {
+ MovGraphNode *node = (MovGraphNode *)*n;
+
+ if (node->_x == from)
+ node->_x = to;
+ }
+
+ gr->calcNodeDistancesAndAngles();
+ }
+ }
}
MctlConnectionPoint::MctlConnectionPoint() {
Commit: 8fc73ea0c541391ce7352d7cd0aba0ff320405a7
https://github.com/scummvm/scummvm/commit/8fc73ea0c541391ce7352d7cd0aba0ff320405a7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-01T14:21:18+03:00
Commit Message:
FULLPIPE: Implement MovGraphLink::~MovGraphLink()
Changed paths:
engines/fullpipe/motion.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 84f09ef..54854e3 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -2542,7 +2542,10 @@ MovGraphLink::MovGraphLink() {
}
MovGraphLink::~MovGraphLink() {
- warning("STUB: MovGraphLink::~MovGraphLink()");
+ delete _movGraphReact;
+
+ _dwordArray1.clear();
+ _dwordArray2.clear();
}
More information about the Scummvm-git-logs
mailing list