Changeset 5826 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Nov 29, 2005, 11:52:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: bomb detonation

Location:

trunk/src/world_entities/weapons

Files:

• bomb.cc (modified) (4 diffs)
• bomb.h (modified) (1 diff)

trunk/src/world_entities/weapons/bomb.cc

@@ -17 +17 @@
 #include "glincl.h"
 #include "state.h"
+#include "model.h"
+#include "fast_factory.h"
 #include "list.h"
-#include "model.h"
-#include "vector.h"
-#include "fast_factory.h"
 
+#include "object_manager.h"
 
 #include "particle_engine.h"
@@ -114 +114 @@
       this->deactivate();
     }
+    if (this->lifeCycle > 0.9f)
+      this->detonate ((this->lifeCycle-.89) *10000.0);
 }
 
@@ -145 +147 @@
 void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
 {
-        this->detonate();
+  if (entity->isA(CL_NPC))
+    this->lifeSpan = 0.9f;
 }
 
@@ -160 +163 @@
 }
 
-void Bomb::detonate()
+void Bomb::detonate(float size)
 {
-  tIterator<WorldEntity>* it = State::getWorldEntityList()->getIterator();
-  WorldEntity* lm = it->firstElement();
-
-  while(lm != NULL)
+  std::list<WorldEntity*>* detonationList = ObjectManager::distanceFromObject(*this, size, CL_NPC);
+  if (detonationList != NULL)
   {
-
-    lm = it->nextElement();
+    while( !detonationList->empty() )
+    {
+    //detonationList->front()->collidesWith(this, Vector(0,0,0));
+      detonationList->pop_front();
+    }
+    delete detonationList;
   }
 }

trunk/src/world_entities/weapons/bomb.h

@@ -31 +31 @@
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
   virtual void activate();
-  virtual void detonate();
   virtual void deactivate();
+
+  void detonate(float size);
 
  private: