Changeset 7076 in orxonox.OLD for trunk/src/world_entities/npcs/npc.cc

Timestamp:

Feb 7, 2006, 3:46:43 PM (18 years ago)

Author:

bensch

Message:

weaponAdjustment

File:

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

trunk/src/world_entities/npcs/npc.cc

@@ -41 +41 @@
 void NPC::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_PROJECTILE) && entity != this->collider)
+
+  if (entity == collider)
+    return;
+  collider = entity;
+
+  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);
-    if ((float)rand()/RAND_MAX < .3)
+    this->decreaseHealth(entity->getHealth() *(float)rand()/(float)RAND_MAX);
+    // EXTREME HACK
+    if (this->getHealth() <= 0.0f)
     {
-      WorldEntity* powerUp = new TurretPowerUp();
-      powerUp->setAbsCoor(this->getAbsCoor());
-//      powerUp->toList(OM_COMMON);
+      this->destroy();
     }
-    else if ((float)rand()/RAND_MAX < .3)
-    {
-      WorldEntity* powerUp = new LaserPowerUp();
-      powerUp->setAbsCoor(this->getAbsCoor());
-      powerUp->toList(OM_COMMON);
-    }
-    this->toList(OM_DEAD);
-    this->removeNode();
+  }
 
-      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);
-    this->toList(OM_DEAD);
-    this->removeNode();
-  }
+
+// //    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());
+// //      powerUp->toList(OM_COMMON);
+//     }
+//     else if ((float)rand()/RAND_MAX < .3)
+//     {
+//       WorldEntity* powerUp = new LaserPowerUp();
+//       powerUp->setAbsCoor(this->getAbsCoor());
+//       powerUp->toList(OM_COMMON);
+//     }
+//     this->toList(OM_DEAD);
+//     this->removeNode();
+//
+//       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);
+//     this->toList(OM_DEAD);
+//     this->removeNode();
+//   }
 }