Changeset 3530 in orxonox.OLD for orxonox/branches/levelloader/src/track_manager.cc

Timestamp:

Mar 13, 2005, 10:40:25 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Got the system to compile, the basic backbone now runs. What remains to be done is implementing all necessary functions to load all vital classes into a world

File:

• orxonox/branches/levelloader/src/track_manager.cc (modified) (16 diffs)

orxonox/branches/levelloader/src/track_manager.cc

@@ -112 +112 @@
 {
   // return if Found.
-  if ( this->name != NULL && !strcmp( this->name, trackname))
+  if ( this->name != NULL && !strcmp( this->name, trackName))
     return this;
   // search on.
@@ -160 +160 @@
   PRINTF(3)("Deleting all the TrackElements\n");
   delete this->firstTrackElem;
-  delete this->namer;
+  // delete this->name;
 
   // we do not have a TrackManager anymore
@@ -196 +196 @@
                 if( this->findTrackElementByName( names->getString(i)))
                 {
-                        PRINTF(ERR)("Track name '%s' already taken
+                        PRINTF(1)("Track name '%s' already taken", names->getString(i));
                 }
             }
@@ -699 +699 @@
         while( element != NULL)
         {
-                if( !strcmp( element->Value(), "Point")
+                if( !strcmp( element->Value(), "Point"))
                 {
                         container = element->FirstChild();
-                        if( container != NULL && container->Type() == TEXT)
+                        if( container->ToText())
                         {
                                 assert( container->Value() != NULL);
@@ -709 +709 @@
                                 else
                                 {
-                                        PRINTF(ERR)("Invalid Point in Track (skipped)\n");
+                                        PRINTF(1)("Invalid Point in Track (skipped)\n");
                                 }                       
                         }
                 }
-                else if( !strcmp( element->Value(), "Duration")
+                else if( !strcmp( element->Value(), "Duration"))
                 {
                         container = element->FirstChild();
-                        if( container != NULL && container->Type() == TEXT)
+                        if( container->ToText())
                         {
                                 assert( container->Value() != NULL);
@@ -723 +723 @@
                                 else
                                 {
-                                        PRINTF(ERR)("Invalid Duration in Track (skipped)\n");
+                                        PRINTF(1)("Invalid Duration in Track (skipped)\n");
                                 }                       
                         }
                 }
-                else if( !strcmp( element->Value(), "SavePoint")
+                else if( !strcmp( element->Value(), "SavePoint"))
                 {
                         setSavePoint();
                 }
-                else if( !strcmp( element->Value(), "Fork")
+                else if( !strcmp( element->Value(), "Fork"))
                 {
                         container = element->FirstChild();
-                        if( container != NULL && container->Type() == TEXT)
+                        if( container->ToText())
                         {
                                 assert( container->Value() != NULL);
@@ -740 +740 @@
                         }
                 }
-                else if( !strcmp( element->Value(), "Join")
+                else if( !strcmp( element->Value(), "Join"))
                 {
                         container = element->FirstChild();
-                        if( container != NULL && container->Type() == TEXT)
+                        if( container->ToText())
                         {
                                 assert( container->Value() != NULL);
@@ -749 +749 @@
                         }
                 }
-                else if( !strcmp( element->Value(), "WorkOn")
+                else if( !strcmp( element->Value(), "WorkOn"))
                 {
                         container = element->FirstChild();
-                        if( container != NULL && container->Type() == TEXT)
+                        if( container->ToText())
                         {
                                 assert( container->Value() != NULL);
@@ -769 +769 @@
    The names used have to be unique within a particular track system.
 */
-void TrackManager::forkS( char* string)
+void TrackManager::forkS( const char* string)
 {
         // get the names for the tracks and therefore the amount of new tracks
-        SubString* names = new SubString( string);
+        SubString* parts = new SubString( string);
         int *IDs;
         int n = parts->getN();
@@ -780 +780 @@
         IDs = new int[n];
         
-        forkV( n, IDs, names);
+        forkV( n, IDs, parts);
         
         // IDs are irrelevant when assigning string names to tracks
         delete IDs;
-        delete names;
+        delete parts;
 }
 
@@ -791 +791 @@
    \param string the names of the track to be joined, separated by commas
 */
-void TrackManager::joinS( char* string)
+void TrackManager::joinS( const char* string)
 {
         SubString* parts = new SubString( string);
@@ -805 +805 @@
         t = n;
         
-        PRINTF(DEBUG)("Joining tracks:");
+        PRINTF(4)("Joining tracks:");
         
         for( int i = 0; i < n; i++)
@@ -812 +812 @@
                 if( element == NULL)
                 {
-                        PRINTF(ERR)("Track name '%s' unknown, could not join\n", parts->getString( i));
+                        PRINTF(1)("Track name '%s' unknown, could not join\n", parts->getString( i));
                         t--;
                 }
                 else
                 {
-                        PRINTF(DEBUG)(" '%s'(%d)", parts->getString( i), element->ID);
+                        PRINTF(4)(" '%s'(%d)", parts->getString( i), element->ID);
                         IDs[d] = element->ID;
                         d++;
@@ -823 +823 @@
         }
         
-        PRINTF(DEBUG)("\n");
+        PRINTF(4)("\n");
 
         joinV( t, IDs);
@@ -835 +835 @@
    \param string the name of the track to work on (must have been previosly set by forkS)
 */
-void TrackManager::workOnS( char* string)
+void TrackManager::workOnS( const char* string)
 {
   TrackElement* tmpElem = findTrackElementByName( string);
@@ -841 +841 @@
     this->currentTrackElem = tmpElem;
   else
-    PRINTF(ERR)("TrackElement not Found, leaving unchanged\n");
-  PRINTF(DEBUG)("now Working on %d\n", this->currentTrackElem->ID);
-}
+    PRINTF(1)("TrackElement not Found, leaving unchanged\n");
+  PRINTF(4)("now Working on %d\n", this->currentTrackElem->ID);
+}