Index: orxonox/trunk/src/lib/coord/helper_parent.cc
===================================================================
--- orxonox/trunk/src/lib/coord/helper_parent.cc	(revision 4318)
+++ orxonox/trunk/src/lib/coord/helper_parent.cc	(revision 4320)
@@ -30,5 +30,5 @@
 HelperParent::HelperParent () 
 {
-   this->setClassID(CL_HELPER_PARENT);
+   this->setClassID(CL_HELPER_PARENT, "HelperParent");
 }
 
Index: orxonox/trunk/src/lib/graphics/graphics_engine.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/graphics_engine.cc	(revision 4318)
+++ orxonox/trunk/src/lib/graphics/graphics_engine.cc	(revision 4320)
@@ -34,5 +34,5 @@
   this->minFPS = 9999;
   this->maxFPS = 0;
-  this->setClassID(CL_GRAPHICS_ENGINE);
+  this->setClassID(CL_GRAPHICS_ENGINE, "GraphicsEngine");
 
   this->fullscreen = false;
Index: orxonox/trunk/src/lib/graphics/light.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/light.cc	(revision 4318)
+++ orxonox/trunk/src/lib/graphics/light.cc	(revision 4320)
@@ -34,5 +34,5 @@
 Light::Light(int lightNumber)
 {
-  this->setClassID(CL_LIGHT);
+  this->setClassID(CL_LIGHT, "Light");
   char tmpName[7];
   sprintf(tmpName, "Light%d", lightNumber);
@@ -205,5 +205,5 @@
 LightManager::LightManager () 
 {
-  this->setClassID(CL_LIGHT_MANAGER);
+  this->setClassID(CL_LIGHT_MANAGER, "LightManager");
 
   glEnable (GL_LIGHTING);
Index: orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc	(revision 4318)
+++ orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc	(revision 4320)
@@ -30,5 +30,5 @@
 		  float velocity)
 {
-   this->setClassID(CL_PARTICLE_EMITTER);
+   this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
    this->direction = direction;
    this->setSpread(angle);
Index: orxonox/trunk/src/lib/graphics/particles/particle_engine.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/particles/particle_engine.cc	(revision 4318)
+++ orxonox/trunk/src/lib/graphics/particles/particle_engine.cc	(revision 4320)
@@ -30,5 +30,5 @@
 ParticleEngine::ParticleEngine () 
 {
-   this->setClassID(CL_PARTICLE_ENGINE);
+   this->setClassID(CL_PARTICLE_ENGINE, "ParticleEngine");
 
    this->systemList = new tList<ParticleSystem>;
Index: orxonox/trunk/src/lib/graphics/particles/particle_system.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/particles/particle_system.cc	(revision 4318)
+++ orxonox/trunk/src/lib/graphics/particles/particle_system.cc	(revision 4320)
@@ -34,5 +34,5 @@
 ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
 {
-   this->setClassID(CL_PARTICLE_SYSTEM);
+   this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
    this->material = NULL;
    this->name = NULL;
Index: orxonox/trunk/src/lib/graphics/text_engine.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/text_engine.cc	(revision 4318)
+++ orxonox/trunk/src/lib/graphics/text_engine.cc	(revision 4320)
@@ -51,5 +51,5 @@
 Text::Text(Font* font, int type)
 {
-  this->setClassID(CL_TEXT);
+  this->setClassID(CL_TEXT, "Text");
 
   // initialize this Text
@@ -802,5 +802,5 @@
 TextEngine::TextEngine () 
 {
-   this->setClassID(CL_TEXT_ENGINE);
+   this->setClassID(CL_TEXT_ENGINE, "TextEngine");
    this->enableFonts();
 
Index: orxonox/trunk/src/lib/lang/base_object.cc
===================================================================
--- orxonox/trunk/src/lib/lang/base_object.cc	(revision 4318)
+++ orxonox/trunk/src/lib/lang/base_object.cc	(revision 4320)
@@ -42,4 +42,10 @@
 }
 
+void BaseObject::setClassID(int id, const char* className)
+{
+  this->id = id;
+  this->className = className;
+}
+
 
 void BaseObject::setClassID (int id)
@@ -48,4 +54,8 @@
 }
 
+void BaseObject::setClassName(const char* className)
+{
+  this->className = className;
+}
 
 
Index: orxonox/trunk/src/lib/lang/base_object.h
===================================================================
--- orxonox/trunk/src/lib/lang/base_object.h	(revision 4318)
+++ orxonox/trunk/src/lib/lang/base_object.h	(revision 4320)
@@ -17,8 +17,9 @@
   virtual ~BaseObject ();
 
-  //void setClassName (const char* className);
   void setClassID(int id);
+  void setClassName(const char* className);
+  void setClassID(int id, const char* className);
 
-  inline const char* getClassName(void) const { return "";};
+  inline const char* getClassName(void) const { return this->className;};
   inline int getClassID(void) const { return this->id; }
   bool isA (char* className);
