Changeset 8515 in orxonox.OLD for branches

Timestamp:

Jun 16, 2006, 1:40:28 AM (19 years ago)

Author:

patrick

Message:

bsp: finished the first code for the generic npc model

Location:

branches/bsp_model/src/world_entities

Files:

• npcs/generic_npc.cc (modified) (2 diffs)
• npcs/generic_npc.h (modified) (1 diff)
• test_entity.h (modified) (1 diff)

branches/bsp_model/src/world_entities/npcs/generic_npc.cc

@@ -134 +134 @@
   if( likely(this->getModel(0) != NULL))
     ((InteractiveModel*)this->getModel(0))->tick(time);
-
 }
 
@@ -142 +141 @@
 {
   int randi = (int)(5.0f * (float)rand()/(float)RAND_MAX);
-
-  PRINTF(0)("randi = %i\n", randi);
 
   if( randi == 1)

branches/bsp_model/src/world_entities/npcs/generic_npc.h

@@ -18 +18 @@
 class GenericNPC : public NPC
 {
-  friend class World;
-
  public:
   GenericNPC(const TiXmlElement* root);

branches/bsp_model/src/world_entities/test_entity.h

@@ -15 +15 @@
 class TestEntity : public WorldEntity, public PhysicsInterface
 {
-  friend class World;
-
  public:
   TestEntity ();