Changeset 4729 in orxonox.OLD

Timestamp:

Jun 29, 2005, 12:05:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: factory-fix

Location:

orxonox/trunk/src/util/loading

Files:

• factory.cc (modified) (2 diffs)
• factory.h (modified) (4 diffs)
• game_loader.cc (modified) (1 diff)

orxonox/trunk/src/util/loading/factory.cc

@@ -35 +35 @@
   this->setName(factoryName);
 
-  this->factoryName = NULL;
-  this->setFactoryName(factoryName);
   next = NULL;
 
@@ -54 +52 @@
   if (this->next)
     delete this->next;
-
-  if (this->factoryName)
-    delete []this->factoryName;
 }
-
-/**
-   \brief sets the name of this factory
-*/
-void Factory::setFactoryName(const char* factoryName)
-{
-  if (this->factoryName)
-    delete this->factoryName;
-  this->factoryName = new char[strlen(factoryName)+1];
-  strcpy(this->factoryName, factoryName);
-}
-
 
 /**

orxonox/trunk/src/util/loading/factory.h

@@ -48 +48 @@
   void initialize();
   void registerFactory( Factory* factory);
-  void setFactoryName(const char* factoryName);
-  /** \returns the name of the factory */
-  const char* getFactoryName() { return this->factoryName; };
   /** \brief sets the Next factory in the list \param nextFactory the next factory */
   inline void setNext( Factory* nextFactory) { this->next = nextFactory; };
@@ -56 +53 @@
   Factory* getNext(void) const { return this->next; };
 
- protected:
-  char*         factoryName;          //!< the name of the factory
  private:
-  Factory*      next;                 //!< pointer to the next factory.
+  Factory*          next;                 //!< pointer to the next factory.
+  static Factory*   first;                //!< A pointer to the first factory.
 };
 
@@ -83 +79 @@
 tFactory<T>::tFactory(const char* factoryName) : Factory(factoryName)
 {
-  PRINTF(5)("fileName: %s loadable\n", this->factoryName);
+  PRINTF(5)("fileName: %s loadable\n", this->getName());
 }
 
@@ -94 +90 @@
 BaseObject* tFactory<T>::fabricate(const TiXmlElement* root)
 {
-  if(!strcmp(root->Value(), getFactoryName()))
+  if(!strcmp(root->Value(), getName()))
     return new T ( root);
   else if( getNext() != NULL)

orxonox/trunk/src/util/loading/game_loader.cc

@@ -326 +326 @@
         assert( factory != NULL);
 
-        PRINTF(4)("Registered factory for '%s'\n", factory->getFactoryName());
+        PRINTF(4)("Registered factory for '%s'\n", factory->getName());
 
         if( first == NULL) first = factory;