Changeset 5982 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Dec 8, 2005, 12:22:53 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Factory-Redesign on the wish of manuel

Location:

trunk/src/story_entities

Files:

• campaign.cc (modified) (2 diffs)
• world.cc (modified) (1 diff)

trunk/src/story_entities/campaign.cc

@@ -19 +19 @@
 #include "campaign.h"
 
+#include "factory.h"
 #include "game_loader.h"
 #include "story_entity.h"
@@ -90 +91 @@
   {
     PRINTF(5)("Campaign: Constructor: adding a world\n");
-    StoryEntity* created = (StoryEntity*) GameLoader::getInstance()->fabricate(element);
+    StoryEntity* created = (StoryEntity*) Factory::fabricate(element);
     if( created != NULL)
     {

trunk/src/story_entities/world.cc

@@ -317 +317 @@
       while( element != NULL)
         {
-          BaseObject* created = (loader->fabricate(element));
+          BaseObject* created = (Factory::fabricate(element));
           if( created != NULL )
           {
             if(created->isA(CL_WORLD_ENTITY))
               this->spawn(dynamic_cast<WorldEntity*>(created));
-            printf("Created a %s: %s\n", created->getClassName(), created->getName());
+            PRINTF(4)("Created a %s: %s\n", created->getClassName(), created->getName());
           }