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

Timestamp:

Dec 11, 2005, 6:23:42 PM (18 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

File:

• trunk/src/world_entities/npcs/npc_test1.cc (modified) (1 diff)

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)