Changeset 5750 in orxonox.OLD for trunk/src/util/loading/factory.cc

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

• trunk/src/util/loading/factory.cc (modified) (2 diffs)

trunk/src/util/loading/factory.cc

@@ -34 +34 @@
    set everything to zero and define factoryName
 */
-Factory::Factory (const char* factoryName)
+Factory::Factory (const char* factoryName, ClassID classID)
 {
   this->setClassID(CL_FACTORY, "Factory");
@@ -40 +40 @@
 
   this->next = NULL;
+  this->classID = classID;
 
   Factory::registerFactory(this);