- Timestamp:
- Jan 6, 2005, 2:10:38 PM (20 years ago)
- Location:
- orxonox/branches/parenting/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/parenting/src/track_manager.cc
r3355 r3356 33 33 this->isFork = false; 34 34 this->isJoined = false; 35 this->mainJoin = false; 35 36 this->cond; //!< todo think!! 36 37 this->ID = -1; … … 57 58 if (this->curve) 58 59 delete this->curve; 59 if ( this->childCount > 0)60 if ((!this->isJoined &&this->childCount > 0) || (this->isJoined && this->mainJoin)) 60 61 { 61 62 for (int i=0; i < this->childCount; i++) 62 63 delete this->children[i]; 63 } 64 if (children) 65 delete children; 64 delete this->children; 65 } 66 66 } 67 67 … … 384 384 Vector tmpTangentPoint = firstJoint->curve->getNode(firstJoint->curve->getNodeCount()-1); 385 385 firstJoint->isJoined = true; 386 firstJoint->mainJoin = true; 386 387 if(!firstJoint->isHotPoint) 387 388 this->setSavePoint(); -
orxonox/branches/parenting/src/track_manager.h
r3354 r3356 40 40 bool isFork; //!< If the first node is a Fork 41 41 bool isJoined; //!< If the End of the Curve is joined. 42 bool mainJoin; //!< If the End of the Curve is joined, and this is the one Curve the others join to. 42 43 PathCondition cond; //!< The Split Condition; 43 44 int ID; //!< The ID of this TrackElement -
orxonox/branches/parenting/src/world.cc
r3355 r3356 587 587 trackManager->drawGraph(.01); 588 588 trackManager->debug(2); 589 //delete trackManager;589 delete trackManager; 590 590 591 591 /*
Note: See TracChangeset
for help on using the changeset viewer.