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

Timestamp:

Nov 24, 2005, 12:13:22 AM (19 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/story_entities/world.cc (modified) (3 diffs)

trunk/src/story_entities/world.cc

@@ -70 +70 @@
 
 #include "cd_engine.h"
-#include "npc.h"
-#include "npc2.h"
+#include "npcs/npc_test1.h"
 #include "shader.h"
 
@@ -81 +80 @@
 
 //! This creates a Factory to fabricate a World
-CREATE_FACTORY(World);
+CREATE_FACTORY(World, CL_WORLD);
 
 World::World(const TiXmlElement* root)
@@ -469 +468 @@
   for(int i = 0; i < 100; i++)
   {
-    WorldEntity* tmp = new NPC();
+    WorldEntity* tmp = new NPCTest1();
     char npcChar[10];
     sprintf (npcChar, "NPC_%d", i);