Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player/src/factory.cc

Timestamp:

May 18, 2005, 11:27:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

File:

• orxonox/branches/movie_player/src/factory.cc (modified) (4 diffs)

orxonox/branches/movie_player/src/factory.cc

@@ -28 +28 @@
    \brief constructor
    
-   set everything to zero and define classname
+   set everything to zero and define factoryName
 */
 Factory::Factory (const char* name)
 {
-  this->setClassname(name);
+  this->factoryName = NULL;
+  this->setFactoryName(name);
   next = NULL;
   
@@ -45 +46 @@
 Factory::~Factory ()
 {
-  //  printf("%s\n", this->classname);
+  //  printf("%s\n", this->factoryName);
   //  Factory* tmpDel = this->next;
   //  this->next = NULL;
@@ -52 +53 @@
 }
 
-void Factory::setClassname(const char* name)
+void Factory::setFactoryName(const char* name)
 {
-  if (classname)
-    delete classname;
-  classname = new char[strlen(name)+1];
-  strcpy(classname, name);
+  if (factoryName)
+    delete factoryName;
+  factoryName = new char[strlen(name)+1];
+  strcpy(factoryName, name);
 }
 
@@ -74 +75 @@
 void Factory::initialize()
 {
-  assert( classname != NULL);
   GameLoader* gl = GameLoader::getInstance();
   gl->registerFactory( this);