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

Timestamp:

Mar 13, 2005, 10:40:25 PM (20 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

Location:

orxonox/branches/levelloader/src

Files:

• defs/debug.h (modified) (3 diffs)
• defs/error.h (modified) (2 diffs)
• defs/stdincl.h (modified) (4 diffs)
• factory.cc (modified) (5 diffs)
• factory.h (modified) (2 diffs)
• game_loader.cc (modified) (8 diffs)
• game_loader.h (modified) (1 diff)
• lib/util/substring.cc (modified) (4 diffs)
• lib/util/substring.h (modified) (3 diffs)
• story_entities/campaign.cc (modified) (4 diffs)
• story_entities/campaign.h (modified) (1 diff)
• story_entities/world.cc (modified) (11 diffs)
• story_entities/world.h (modified) (3 diffs)
• track_manager.cc (modified) (16 diffs)
• track_manager.h (modified) (4 diffs)

orxonox/branches/levelloader/src/defs/debug.h

@@ -22 +22 @@
 #define _DEBUG_H
 
+#if HAVE_CONFIG_H 
+#include <config.h> 
+#endif
+
+#include <stdio.h>
+
 #define NO              0
 #define ERR             1
@@ -28 +34 @@
 #define DEBUGING        4
 
-#if HAVE_CONFIG_H 
-#include <config.h> 
-#endif
-
-#include <stdio.h>
-
 ///////////////////////////////////////////////////
 /// PRINTF: prints with filename and linenumber ///
 ///////////////////////////////////////////////////
-
 #ifdef DEBUG
 extern int verbose;
 #define PRINTF(x) \
            PRINTF ## x
-
+           
 #if DEBUG >= ERR
 #define PRINTF1 \
@@ -92 +91 @@
 #define PRINT(x) \
   PRINT ## x
-
+  
 #if DEBUG >= ERR
 #define PRINT1  \

orxonox/branches/levelloader/src/defs/error.h

@@ -23 +23 @@
 
 
-#ifndef _ERROR_H
-#define _ERROR_H
+#ifndef _ORX_ERROR_H
+#define _ORX_ERROR_H
 
 // these are the two undefined error nr. Don't use them ...
@@ -54 +54 @@
 */
 
-typedef struct 
+typedef struct ErrorMessage
 {
   int code;

orxonox/branches/levelloader/src/defs/stdincl.h

@@ -8 +8 @@
 #ifndef _STDINCL_H
 #define _STDINCL_H
-
+                
 #define null 0   //!< null
 
@@ -22 +22 @@
 #endif
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27 +28 @@
 #include "glincl.h"
 
+#include "error.h"
+#include "debug.h"
 
 // MATH //
@@ -41 +44 @@
 #include "factory.h"
 
-#include "error.h"
-#include "debug.h"
+#define CREATE_FACTORY(x) \
+                class x ## Factory : public Factory { \
+                 public:        \
+                  x ## Factory (){setNext( NULL); setClassname( #x ); initialize();} \
+                  ~x ## Factory () {}; \
+                 private: \
+                        BaseObject* fabricate( TiXmlElement* root) \
+                        { \
+                                if(!strcmp(root->Value(), getClassname())) return new  x ( root); \
+                                else if( getNext() != NULL) return getNext()->fabricate( root); \
+                                else return NULL; \
+                        } \
+                }; \
+                x ## Factory global_ ## x ## Factory;
 
 #endif /* _STDINCL_H */

orxonox/branches/levelloader/src/factory.cc

@@ -18 +18 @@
 
 #include "factory.h"
+#include "game_loader.h"
 
 using namespace std;
@@ -33 +34 @@
 Factory::Factory ()
 {
-        classname = "NULL"
+        classname = "NULL";
         next = NULL;
 }
 
 /**
-   \brief constructor
+   \brief destructor
    
    clear the Q
@@ -51 +52 @@
    \brief generates the associated object from data
 */
-BaseObject* ObjectFactory::fabricate( TiXmlElement* data)
+BaseObject* Factory::fabricate( TiXmlElement* data)
 {
         return NULL;
@@ -61 +62 @@
 void Factory::initialize()
 {
+        assert( classname != NULL);
+        PRINTF(3)("Initializing %sFactory\n", classname);
         GameLoader* gl = GameLoader::getInstance();
         gl->registerFactory( this);
@@ -88 +91 @@
         while( node != NULL)
         {
-                if( node->Type() == TEXT) return node->Value();
-                node = node->NextChild();
+                if( node->ToText()) return node->Value();
+                node = node->NextSibling();
         }
         return NULL;

orxonox/branches/levelloader/src/factory.h

@@ -8 +8 @@
 
 #include "stdincl.h"
-#include "world.h"
 
-#define CREATE_FACTORY(CLASS) class CLASSFactory : public Factory { \
- public:        \
-  CLASSFactory (){setNext( NULL); setClassname = "CLASS"; initialize();} \
-  ~CLASSFactory (); \
- private: \
-        BaseObject* fabricate( TiXmlElement* root) \
-        { \
-                if(!strcmp(root->Value(), getClassname())) return new CLASS( root); \
-                else if( next != NULL) return next->fabricate( root); \
-                else return NULL; \
-        } \
-}; \
-CLASSFactory global_CLASSFactory;
+class BaseObject;
 
 //! The Factory is
@@ -37 +24 @@
         void initialize();
   void registerFactory( Factory* factory);
-        void setClassname(char* name) {classname = name};
-        char* getClassname() {return classname};
-        void setNext( ObjectFactory* factory) {next = factory};
+        void setClassname(char* name) {classname = name;}
+        char* getClassname() {return classname;};
+        void setNext( Factory* factory) {next = factory;}
+        Factory* getNext() {return next;}
         
  private:

orxonox/branches/levelloader/src/game_loader.cc

@@ -15 +15 @@
    co-programmer: ...
 */
-
 
 #include "game_loader.h"
@@ -162 +161 @@
   if( name == NULL)
   {
-                PRINTF(ERR)("No filename specified for loading");
+                PRINTF(1)("No filename specified for loading");
                 return NULL;
   }
@@ -168 +167 @@
         TiXmlDocument* XMLDoc = new TiXmlDocument( name);
         // load the campaign document
-        if( !XMLDoc.LoadFile())
+        if( !XMLDoc->LoadFile())
         {
                 // report an error
-                PRINTF(ERR)("Error loading XML File: %s @ %d:%d\n", XMLDoc.ErrorDesc(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
+                PRINTF(1)("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
                 delete XMLDoc;
                 return NULL;
@@ -177 +176 @@
         
         // check basic validity
-        TiXmlElement* element = XMLDoc.RootElement();
+        TiXmlElement* element = XMLDoc->RootElement();
         assert( element != NULL);
         
@@ -185 +184 @@
         {
                 // report an error
-                PRINTF(ERR)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
+                PRINTF(1)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
                 delete XMLDoc;
                 return NULL;
@@ -191 +190 @@
         
         // construct campaign
-        Campaign c = new Campaign( element);
+        Campaign* c = new Campaign( element);
         
         // free the XML data
         delete XMLDoc;
+        
+        return c;
 }
 
@@ -269 +270 @@
 void GameLoader::registerFactory( Factory* factory)
 {
-        if( next == NULL) next = factory;
-        else next->registerFactory( factory);
+        assert( factory != NULL);
+        
+        printf("Registered factory for '%s'\n", factory->getClassname());
+        
+        if( first == NULL) first = factory;
+        else first->registerFactory( factory);
 }
 
@@ -277 +282 @@
    \param element a XMLElement containing all the needed info
 */
-StoryEntity* GameLoader::fabricate( TiXmlElement* element)
+BaseObject* GameLoader::fabricate( TiXmlElement* element)
 {
         if( first == NULL)
         {
-                PRINTF(ERR)("GameLoader does not know any factories, fabricate() failed\n");
+                PRINTF(1)("GameLoader does not know any factories, fabricate() failed\n");
                 return NULL;
         }

orxonox/branches/levelloader/src/game_loader.h

@@ -4 +4 @@
 #include "stdincl.h"
 #include "story_def.h"
+#include "factory.h"
 
 //-----------------------------------------------------------------------------

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

@@ -22 +22 @@
 #include "substring.h"
 
-SubString::SubString( char* string)
+SubString::SubString( const char* string)
 {
         n = 0;
@@ -32 +32 @@
         n += 1;
         
-        strings = malloc( sizeof( char*) * n);
+        strings = new char*[n];
         
         int i = 0;
         int l = 0;
         
-        char* offset = string;
+        const char* offset = string;
         char* end = strchr( string, ',');
         while( end != NULL)
         {
                 l = end - offset;
-                strings[i] = malloc( l + 1);
+                strings[i] = new char[l + 1];
                 strncpy( strings[i], offset, l);
                 i++;
@@ -50 +50 @@
         }
         
-        strings[i] = malloc( l + 1);
+        strings[i] = new char[l + 1];
         strncpy( strings[i], offset, l);
         l = strlen( offset);
@@ -62 +62 @@
         for( int i = 0; i < n; i++)
         {
-                free( strings[i]);
+                delete strings[i];
         }
         
-        free( strings);
+        delete strings;
 }
 

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

@@ -3 +3 @@
     \brief a small class to get the parts of a string separated by commas
 */
+
+#ifndef _SUBSTRING_H
+#define _SUBSTRING_H
 
 #include "stdincl.h"
@@ -10 +13 @@
         public:
         
-                SubString( char* string);
+                SubString( const char* string);
                 ~SubString();
                 
@@ -20 +23 @@
                 int n;
 };
+
+#endif /* _SUBSTRING_H */

orxonox/branches/levelloader/src/story_entities/campaign.cc

@@ -22 +22 @@
 #include "story_entity.h"
 #include "factory.h"
+#include "game_loader.h"
 
 using namespace std;
 
+CREATE_FACTORY(Campaign);
 
 Campaign::Campaign () 
@@ -37 +39 @@
 {
         TiXmlElement* element;
-        char string;
+        const char* string;
         int id;
         
@@ -48 +50 @@
   // grab all the necessary parameters
         string = grabParameter( root, "identifier");
-        if( string == NULL || if( sscanf(string, "%d", &id) != 1))
-        {
-                PRINTF(ERR)("Campaign is missing a proper 'identifier'\n");
-                setStoryId( -1);
-        }
-        else setStoryId( id);
+        if( string == NULL || sscanf(string, "%d", &id) != 1)
+        {
+                PRINTF(1)("Campaign is missing a proper 'identifier'\n");
+                this->setStoryID( -1);
+        }
+        else this->setStoryID( id);
         
   // find WorldList
@@ -63 +65 @@
                 StoryEntity* created = (StoryEntity*) loader->fabricate( element);
                 if( created != NULL) addEntity( created);
-                element = element->nextSiblingElement();
+                element = element->NextSiblingElement();
         }
 }

orxonox/branches/levelloader/src/story_entities/campaign.h

@@ -41 +41 @@
 };
 
-CREATE_FACTORY(Campaign);
-
 #endif /* _CAMPAIGN_H */

orxonox/branches/levelloader/src/story_entities/world.cc

@@ -30 +30 @@
 #include "fontset.h"
 #include "factory.h"
+#include "game_loader.h"
 
 using namespace std;
 
+CREATE_FACTORY(World);
 
 World::World( TiXmlElement* root)
 {
-        char *string, *name;
+        const char *string;
+        char *name;
         int id;
 
         // identifier
         string = grabParameter( root, "identifier");
-        if( string == NULL || if( sscanf(string, "%d", &id) != 1))
-        {
-                PRINTF(ERR)("World is missing a proper 'identifier'\n");
-                setStoryId( -1);
-        }
-        else setStoryId( id);
+        if( string == NULL || sscanf(string, "%d", &id) != 1)
+        {
+                PRINTF(1)("World is missing a proper 'identifier'\n");
+                this->setStoryID( -1);
+        }
+        else setStoryID( id);
         
         // path
@@ -52 +55 @@
         if( string == NULL)
         {
-                PRINTF(ERR)("World is missing a proper 'path'\n");
-                setPath( NULL);
+                PRINTF(1)("World is missing a proper 'path'\n");
+                this->setPath( NULL);
         }
         else
@@ -59 +62 @@
                 name = new char[strlen(string + 2)];
                 strcpy( name, string);
-                setPath( name);
+                this->setPath( name);
         }
         
@@ -105 +108 @@
   this->nullParent->destroy();  
   delete this->skySphere;
+  if( this->worldName) delete this->worldName;
+  if( this->path) delete this->path;
 
   //delete this->trackManager;
@@ -137 +142 @@
   if( getPath() == NULL)
   {
-                PRINTF(ERR)("World has no path specified for loading");
+                PRINTF(1)("World has no path specified for loading");
                 return (ErrorMessage){213,"Path not specified","World::load()"};
   }
   
-        TiXmlDocument* XMLDoc = new TiXmlDocument( name);
+        TiXmlDocument* XMLDoc = new TiXmlDocument( path);
         // load the campaign document
-        if( !XMLDoc.LoadFile())
+        if( !XMLDoc->LoadFile())
         {
                 // report an error
-                PRINTF(ERR)("Error loading XML File: %s @ %d:%d\n", XMLDoc.ErrorDesc(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
+                PRINTF(1)("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
                 delete XMLDoc;
                 return (ErrorMessage){213,"XML File parsing error","World::load()"};
@@ -152 +157 @@
         
         // check basic validity
-        TiXmlElement* root = XMLDoc.RootElement();
+        TiXmlElement* root = XMLDoc->RootElement();
         assert( root != NULL);
         
-        element = root->FirstChildElement( "WorldDataFile");
+        TiXmlElement* element = root->FirstChildElement( "WorldDataFile");
         
         if( root == NULL )
         {
                 // report an error
-                PRINTF(ERR)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
+                PRINTF(1)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
                 delete XMLDoc;
                 return (ErrorMessage){213,"Path not a WorldDataFile","World::load()"};
@@ -167 +172 @@
         // load the parameters
                 // name
-        TiXmlElement* element;
         char* temp;
-        char* string = grabParameter( root, "name");
+        const char* string = grabParameter( root, "name");
         if( string == NULL)
         {
-                PRINTF(ERR)("World is missing a proper 'name'\n");
-                setStoryId( -1);
+                PRINTF(1)("World is missing a proper 'name'\n");
+                this->setStoryID( -1);
         }
         else
         {
                 temp = new char[strlen(string + 2)];
-                worldName = temp;
+                this->worldName = temp;
         }
         
@@ -187 +191 @@
   if( element == NULL)
   {
-                PRINTF(ERR)("World is missing 'WorldEntities'\n");
+                PRINTF(1)("World is missing 'WorldEntities'\n");
   }
   else
@@ -197 +201 @@
                         WorldEntity* created = (WorldEntity*) loader->fabricate( element);
                         if( created != NULL) spawn( created);
-                        element = element->nextSiblingElement();
+                        element = element->NextSiblingElement();
                 }
         }
@@ -205 +209 @@
   if( element == NULL)
   {
-                PRINTF(ERR)("World is missing a 'Track'\n");
+                PRINTF(1)("World is missing a 'Track'\n");
   }
   else
@@ -225 +229 @@
       testFont->buildFont("../data/pictures/font.tga");
 
-      // initializing the TrackManager
-      trackManager = TrackManager::getInstance();
-      trackManager->addPoint(Vector(0,-5,0));
-      trackManager->addPoint(Vector(10,0,5));
-      trackManager->addPoint(Vector(20,0,-5));
-      trackManager->addPoint(Vector(30,0,5));
-      trackManager->addPoint(Vector(40,0,5));
-      trackManager->setDuration(2);
-      trackManager->setSavePoint();
-      trackManager->addPoint(Vector(50,10,10));
-      trackManager->addPoint(Vector(60,0, 10));
-      trackManager->addPoint(Vector(70,0, 10));
-      trackManager->addPoint(Vector(80,0,-10));
-      trackManager->addPoint(Vector(90,0,-10));
-      trackManager->setDuration(5);
-      trackManager->setSavePoint();
-      trackManager->addPoint(Vector(110,0,5));
-      trackManager->addPoint(Vector(120,0, 10));
-      trackManager->addPoint(Vector(130,0, 10));
-      trackManager->addPoint(Vector(140,0,-10));
-      trackManager->addPoint(Vector(150,0,-10));
-      trackManager->setDuration(3);
-      int fork11, fork12, fork13, fork14;
-      trackManager->fork(4, &fork11, &fork12, &fork13, &fork14);
-      trackManager->workOn(fork11);
-      trackManager->addPoint(Vector(170, 0, -15));
-      trackManager->addPoint(Vector(180, 0, -15));
-      trackManager->setDuration(3);
-      trackManager->workOn(fork12);
-      trackManager->addPoint(Vector(170, 0, 10));
-      trackManager->addPoint(Vector(180, 0, 10));
-      trackManager->addPoint(Vector(190,2,5));
-      trackManager->addPoint(Vector(200,2,5));
-      trackManager->setDuration(7);
-      int fork21, fork22;
-      trackManager->fork(2, &fork21, &fork22);
-      trackManager->workOn(fork21);
-      trackManager->addPoint(Vector(220, 10,-10));
-      trackManager->addPoint(Vector(230, 0,-10));
-      trackManager->addPoint(Vector(240, 0, 2));
-      trackManager->addPoint(Vector(250, 0, 0));
-      trackManager->addPoint(Vector(260, 0, 5));
-      trackManager->setDuration(3);
-      trackManager->join(2, fork12, fork11);
-      trackManager->workOn(fork22);
-      trackManager->addPoint(Vector(220, -10,10));
-      trackManager->addPoint(Vector(230, 0, 10));
-      trackManager->addPoint(Vector(240, 0, 10));
-      trackManager->addPoint(Vector(250, 0, 5));
-      trackManager->setDuration(6);
-      trackManager->workOn(fork13);
-      trackManager->addPoint(Vector(200,-10,5));
-      trackManager->addPoint(Vector(250,-10,5));
-      trackManager->setDuration(3);
-      trackManager->workOn(fork14);
-      trackManager->addPoint(Vector(200,15,0));
-      trackManager->addPoint(Vector(210,0,10));
-      trackManager->setDuration(1);
-      trackManager->join(4, fork21, fork22, fork13, fork14);
-      trackManager->workOn(10);
-      trackManager->addPoint(Vector(250,-10,5));
-      trackManager->addPoint(Vector(260,-10,5));
-      trackManager->finalize();
-      
       /*monitor progress*/
       this->glmis->step();

orxonox/branches/levelloader/src/story_entities/world.h

@@ -8 +8 @@
 
 #include "stdincl.h"
+
 #include "story_entity.h"
-
 
 class TrackManager;
@@ -25 +25 @@
    it is the main driving factor during gameplay.
 */
+//#define SUBCLASS(x,y) class x : public y {
+
+//SUBCLASS(World,StoryEntity)
 class World : public StoryEntity {
 
  public:
-        World (TiXmlElement* root),
+        World (TiXmlElement* root);
   World (char* name);
   World (int worldID);
@@ -92 +95 @@
 };
 
-CREATE_FACTORY(World);
-
 #endif /* _WORLD_H */

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);
+}

orxonox/branches/levelloader/src/track_manager.h

@@ -14 +14 @@
 #include "stdincl.h"
 #include "curve.h"
+#include "substring.h"
 
 class PNode;
@@ -38 +39 @@
   TrackElement* findByID(unsigned int trackID);
   TrackElement* findByName(const char* trackName);
-
+        void setName( const char* trackName);
+        
   bool isFresh;              //!< If no Points where added until now
   bool isHotPoint;           //!< If the first node is a specialPoint;
@@ -112 +114 @@
 
   TrackElement* findTrackElementByID(unsigned int trackID) const;
-  TrackElement* findTrackElementByName(char* trackName) const;
+  TrackElement* findTrackElementByName(const char* trackName) const;
   
  public:
@@ -133 +135 @@
   void joinV(unsigned int count, int* trackIDs);
   void finalize(void);
-        void forkS( char* string);
-        void joinS( char* string);
-        void workOnS( char* string);
+        void forkS( const char* string);
+        void joinS( const char* string);
+        void workOnS( const char* string);
 
         // Method to load track data from file