Changeset 6054 in orxonox.OLD for trunk/src/world_entities/npcs

Timestamp:

Dec 11, 2005, 6:23:42 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: multiple new Reparenting modes in PNode.
Testing the stuff in GuidedMissile
Projectile has a PNode as reference not as pointer
some minor weapon changes

Location:

trunk/src/world_entities/npcs

Files:

• npc.cc (modified) (2 diffs)
• npc_test.cc (modified) (1 diff)
• npc_test.h (modified) (1 diff)
• npc_test1.cc (modified) (1 diff)
• npc_test1.h (modified) (1 diff)

trunk/src/world_entities/npcs/npc.cc

@@ -59 +59 @@
     }
     State::getWorldEntityList()->remove(this);
+    this->removeNode();
 
       this->collider = entity;
@@ -68 +69 @@
     this->setVisibiliy(false);
     State::getWorldEntityList()->remove(this);
+    this->removeNode();
   }
 }

trunk/src/world_entities/npcs/npc_test.cc

@@ -58 +58 @@
 
 
-void NPC2::collidesWith(WorldEntity* entity, const Vector& location)
-{
-  if (entity->isA(CL_PROJECTILE))
-  {
-    PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
-    this->applyForce(Vector(0,0,0)-location*1000);
-  }
-  else if (entity->isA(CL_PLAYER))
-    this->applyForce(Vector(0,0,0)-location*100);
-  else
-  {
-    this->setVisibiliy(false);
-   State::getWorldEntityList()->remove(this);
-  }
-}
-
 
 /**

trunk/src/world_entities/npcs/npc_test.h

@@ -20 +20 @@
   virtual void draw() const;
 
-  virtual void collidesWith (WorldEntity* entity, const Vector& location);
-
-
  private:
    Vector   randomRotAxis;

trunk/src/world_entities/npcs/npc_test1.cc

@@ -46 +46 @@
 
 
-void NPCTest1::collidesWith(WorldEntity* entity, const Vector& location)
-{
-  if (entity->isA(CL_PROJECTILE) && entity != this->collider)
-  {
-//    PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
-//    this->applyForce(Vector(0,0,0)-location*1000);
-    if ((float)rand()/RAND_MAX < .3)
-    {
-      WorldEntity* powerUp = new TurretPowerUp();
-      powerUp->setAbsCoor(this->getAbsCoor());
-      State::getWorldEntityList()->add(powerUp);
-    }
-    else if ((float)rand()/RAND_MAX < .3)
-    {
-      WorldEntity* powerUp = new LaserPowerUp();
-      powerUp->setAbsCoor(this->getAbsCoor());
-      State::getWorldEntityList()->add(powerUp);
-    }
-    State::getWorldEntityList()->remove(this);
-
-      this->collider = entity;
-  }
-  else if (entity->isA(CL_PLAYER))
-    this->applyForce(Vector(0,0,0)-location*100);
-  else if (entity->isA(CL_NPC))
-  {
-    this->setVisibiliy(false);
-    State::getWorldEntityList()->remove(this);
-  }
-}
-
 
 void NPCTest1::tick(float dt)

trunk/src/world_entities/npcs/npc_test1.h

@@ -18 +18 @@
   virtual void tick(float dt);
 
-  virtual void collidesWith (WorldEntity* entity, const Vector& location);
-
-
  private:
    Vector   randomRotAxis;