Changeset 4003 in orxonox.OLD for orxonox/branches/ll2trunktemp/src/factory.cc

Timestamp:

Apr 28, 2005, 2:25:08 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/ll2trunktemp: some small modifications, testing, why 2 instances of fabricate are deleted, and not just the first one

File:

• orxonox/branches/ll2trunktemp/src/factory.cc (modified) (7 diffs)

orxonox/branches/ll2trunktemp/src/factory.cc

@@ -1 @@
-
-
 /* 
    orxonox - the future of 3D-vertical-scrollers
@@ -23 +21 @@
 
 /*  --------------------------------------------------
-*                Factory
-*   --------------------------------------------------
-*/
+ *               Factory
+ *   --------------------------------------------------
+ */
 
 /**
@@ -34 +32 @@
 Factory::Factory ()
 {
-        classname = "NULL";
-        next = NULL;
+  classname = "NULL";
+  next = NULL;
+  
+  initialize();
 }
 
@@ -45 +45 @@
 Factory::~Factory ()
 {
-  //if( next != NULL)   delete next;
+  printf("%s\n", this->classname);
+  Factory* tmpDel = this->next;
+  this->next = NULL;
+  //  if (tmpDel)
+  //    delete tmpDel;
 }
-
 
 /**
@@ -54 +57 @@
 BaseObject* Factory::fabricate( TiXmlElement* data)
 {
-        return NULL;
+  return NULL;
 }
 
@@ -62 +65 @@
 void Factory::initialize()
 {
-        assert( classname != NULL);
-        GameLoader* gl = GameLoader::getInstance();
-        gl->registerFactory( this);
+  assert( classname != NULL);
+  GameLoader* gl = GameLoader::getInstance();
+  gl->registerFactory( this);
 }
 
@@ -72 +75 @@
 void Factory::registerFactory( Factory* factory)
 {
-        if( next == NULL) setNext( factory);
-        else next->registerFactory( factory);
+  if( next == NULL) setNext( factory);
+  else next->registerFactory( factory);
 }
 
 const char* grabParameter( TiXmlElement* root, const char* name)
 {
-        TiXmlElement* element;
-        TiXmlNode* node;
+  TiXmlElement* element;
+  TiXmlNode* node;
         
-        assert( root != NULL);
-        assert( name != NULL);
+  assert( root != NULL);
+  assert( name != NULL);
         
-        element = root->FirstChildElement( name);
-        if( element == NULL) return NULL;
+  element = root->FirstChildElement( name);
+  if( element == NULL) return NULL;
         
-        node = element->FirstChild();
-        while( node != NULL)
-        {
-                if( node->ToText()) return node->Value();
-                node = node->NextSibling();
-        }
-        return NULL;
+  node = element->FirstChild();
+  while( node != NULL)
+    {
+      if( node->ToText()) return node->Value();
+      node = node->NextSibling();
+    }
+  return NULL;
 }