Changeset 4502 in orxonox.OLD

Timestamp:

Jun 3, 2005, 12:15:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed the bug with the setSavePointS()-function

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/track/track_manager.cc (modified) (3 diffs)
• util/track/track_manager.h (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -452 +452 @@
   this->localPlayer->setParentMode(PNODE_ALL);
   Vector* cameraOffset = new Vector (0, 5, -10);
-  trackManager->condition(1, LEFTRIGHT, this->localPlayer);
-  trackManager->debug(3);
+  trackManager->condition(2, LEFTRIGHT, this->localPlayer);
 
   this->sky->setParent(this->localCamera);

orxonox/trunk/src/util/track/track_manager.cc

@@ -657 +657 @@
 void TrackManager::setSavePointS(const char* nextElementName)
 {
-  this->firstTrackElem->findByID(this->setSavePoint(NULL))->setName(nextElementName);
+  this->setSavePoint(NULL);
+  if (strcmp(nextElementName, ""))
+    this->firstTrackElem->findByID(this->trackElemCount)->setName(nextElementName);
 }
 
@@ -668 +670 @@
    If the HotPoint was defined as a fork the Point will \b not be set into a savePoint.
 */
-int TrackManager::setSavePoint(TrackElement* trackElem)
+void TrackManager::setSavePoint(TrackElement* trackElem)
 {
   if (!trackElem)
@@ -677 +679 @@
     {
       PRINTF(2)("%d is already finished \n", trackElem->ID);
-      return trackElem->getChild(0)->ID;
+      return;
     }
   trackElem->isSavePoint = true;

orxonox/trunk/src/util/track/track_manager.h

@@ -157 +157 @@
   int addHotPoint(Vector newPoint, TrackElement* trackElem = NULL);
   void setSavePointS(const char* nextElementName);
-  int setSavePoint(TrackElement* trackElem = NULL);
+  void setSavePoint(TrackElement* trackElem = NULL);
   void fork(unsigned int count, ...);
   void forkS(unsigned int count, ...);