Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/track_manager.cc

Timestamp:

Mar 1, 2005, 9:50:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/track_manager.cc (modified) (2 diffs)

orxonox/branches/trackManager/src/track_manager.cc

@@ -376 +376 @@
   int tmpCurrentWorkingID = this->currentTrackElem->ID;
   this->workOn(trackIDs[0]);
-  float tmpLatestTime = this->currentTrackElem->endTime;
+  float tmpLatestTime = 0;
 
   TrackElement* firstJoint = this->currentTrackElem;
@@ -392 +392 @@
       if (tmpJoinElem->childCount == 0
           && tmpJoinElem->endTime > tmpLatestTime)
-            tmpLatestTime = tmpJoinElem->endTime;
+        tmpLatestTime = tmpJoinElem->endTime;
     }
   // Joining: