Changeset 5826 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: bomb detonation

Location:

trunk/src

Files:

• lib/network/Makefile.in (modified) (1 diff)
• subprojects/network/Makefile.in (modified) (1 diff)
• util/object_manager.cc (modified) (1 diff)
• world_entities/weapons/bomb.cc (modified) (4 diffs)
• world_entities/weapons/bomb.h (modified) (1 diff)

trunk/src/lib/network/Makefile.in

@@ -214 +214 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/network/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/network/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/network/Makefile
+          $(AUTOMAKE) --foreign  src/lib/network/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

trunk/src/subprojects/network/Makefile.in

@@ -217 +217 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/network/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/network/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/subprojects/network/Makefile
+          $(AUTOMAKE) --foreign  src/subprojects/network/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

trunk/src/util/object_manager.cc

@@ -63 +63 @@
     for (node = objectList->begin(); node != objectList->end(); node++)
     {
-      printf("1:::%s\n", (*node)->getName());
       if ((dynamic_cast<PNode*>(*node)->getAbsCoor() - center.getAbsCoor()).len() < radius)
-      {
         newList->push_back(dynamic_cast<WorldEntity*>(*node));
-        printf("%s\n",(*node)->getName());
-      }
     }
     return newList;

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: