Changeset 3562 in orxonox.OLD

Timestamp:

Mar 15, 2005, 6:01:21 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Managed to get through the whole loading sequence… still not generating a valid world though…

Location:

orxonox/branches/levelloader/src

Files:

• lib/util/substring.cc (modified) (2 diffs)
• track_manager.cc (modified) (2 diffs)

orxonox/branches/levelloader/src/lib/util/substring.cc

@@ -34 +34 @@
         strings = new char*[n];
         
+        assert( strings != NULL);
+        
         int i = 0;
         int l = 0;
@@ -41 +43 @@
         while( end != NULL)
         {
+                assert( i < n);
                 l = end - offset;
                 strings[i] = new char[l + 1];
+                assert( strings[i] != NULL);
                 strncpy( strings[i], offset, l);
+                strings[i][l] = 0;
                 i++;
                 end++;
                 offset = end;
-                end = strchr( string, ',');
+                end = strchr( offset, ',');
         }
         
         strings[i] = new char[l + 1];
+        l = strlen( offset);
         strncpy( strings[i], offset, l);
-        l = strlen( offset);
+        strings[i][l] = 0;
 }
 

orxonox/branches/levelloader/src/track_manager.cc

@@ -192 +192 @@
   for (int i=0; i<childCount; i++)
     {
-        if( names != NULL)
-        {
-                if( this->findTrackElementByName( names->getString(i)))
-                {
-                        PRINTF(1)("Track name '%s' already taken", names->getString(i));
-                }
-            }
-                
+            
       this->currentTrackElem->children[i] = new TrackElement();
       this->currentTrackElem->children[i]->ID = ++trackElemCount;
       this->currentTrackElem->children[i]->startingTime = this->currentTrackElem->endTime + this->currentTrackElem->jumpTime;
       this->addPoint(this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount()), this->currentTrackElem->children[i]);
-    }
+        if( names != NULL)
+        {
+                // todo check for duplicate track names to avoid confusion
+                /*if( this->findTrackElementByName( names->getString(i)) != NULL)
+                        PRINTF0("Track name '%s' already taken", names->getString(i));
+                else*/
+                        this->currentTrackElem->children[i]->setName( names->getString(i)); 
+            }
+            
+   }
 }
 
@@ -377 +379 @@
   printf("Forking with %d children\n", count);
   if (this->currentTrackElem->isSavePoint)
+  {
+        PRINTF0("Cannot fork a SavePoint - skipped\n");
     return;
+  }
   this->currentTrackElem->isFork = true;
   this->currentTrackElem->isHotPoint = true;