Changeset 5451 in orxonox.OLD for trunk

Timestamp:

Oct 29, 2005, 4:58:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: NPC's die, and emmit a power-UP

Location:

trunk/src

Files:

• lib/gui/gtk_gui/gui_flags.cc (modified) (1 diff)
• world_entities/npc.cc (modified) (2 diffs)
• world_entities/npc.h (modified) (1 diff)
• world_entities/weapons/test_bullet.cc (modified) (1 diff)

trunk/src/lib/gui/gtk_gui/gui_flags.cc

@@ -59 +59 @@
 void GuiFlags::setTextFromFlags(Widget* widget)
 {
-  if (widget == NULL)
-    return;
   FlagInfo flagInfo;
   flagInfo.shortFlags = this->shortFlags;

trunk/src/world_entities/npc.cc

@@ -24 +24 @@
 #include "list.h"
 #include "stdlibincl.h"
+#include "power_ups/turret_power_up.h"
 
 using namespace std;
@@ -43 +44 @@
 void NPC::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_PROJECTILE))
+  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);
+//    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);
+    }
+    State::getWorldEntityList()->remove(this);
+
+      this->collider = entity;
   }
   else if (entity->isA(CL_PLAYER))
     this->applyForce(Vector(0,0,0)-location*100);
-  else
+  else if (entity->isA(CL_NPC))
   {
     this->setVisibiliy(false);
-   State::getWorldEntityList()->remove(this);
+    State::getWorldEntityList()->remove(this);
   }
 }

trunk/src/world_entities/npc.h

@@ -25 +25 @@
    Vector   randomRotAxis;
 
-;
+   WorldEntity* collider;
 
 };

trunk/src/world_entities/weapons/test_bullet.cc

@@ -46 +46 @@
   this->energyMax = 10;
   this->remove();
-  this->lifeSpan = 5;
+  this->lifeSpan = 2;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);