Changeset 4739 in orxonox.OLD for orxonox/trunk/src/util/loading/game_loader.cc

Timestamp:

Jun 30, 2005, 4:05:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: factory is now registered in Factory, not in Gameloader

File:

• orxonox/trunk/src/util/loading/game_loader.cc (modified) (4 diffs)

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

@@ -43 +43 @@
   this->setClassID(CL_GAME_LOADER, "GameLoader");
   this->setName("GameLoader");
-  first = NULL;
 }
 
@@ -317 +316 @@
 }
 
-
-/**
-   \brief add a Factory to the Factory Q
-   \param factory a Factory to be registered
-*/
-void GameLoader::registerFactory( Factory* factory)
-{
-        assert( factory != NULL);
-
-        PRINTF(4)("Registered factory for '%s'\n", factory->getName());
-
-        if( first == NULL) first = factory;
-        else first->registerFactory( factory);
-}
-
-
 /**
    \brief load a StoryEntity
@@ -341 +324 @@
   assert( element != NULL);
 
-  if( first == NULL)
+  if( Factory::getFirst() == NULL)
     {
       PRINTF(1)("GameLoader does not know any factories, fabricate() failed\n");
@@ -350 +333 @@
     {
       PRINTF(4)("Attempting fabrication of a '%s'\n", element->Value());
-      BaseObject* b = first->fabricate( element);
+      BaseObject* b = Factory::getFirst()->fabricate( element);
       if( b == NULL)
         PRINTF(2)("Failed to fabricate a '%s'\n", element->Value());