Changeset 5796 in orxonox.OLD for branches/old.we/src/world_entities

Timestamp:

Nov 27, 2005, 4:07:22 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: moved old world_entites branche out of the way

Location:

branches/old.we

Files:

• . (moved) (moved from branches/world_entities)
• src (copied) (copied from branches/world_entities/src)
• src/world_entities/weapons/bomb.cc (modified) (4 diffs)
• src/world_entities/weapons/bomb.h (modified) (1 diff)

branches/old.we/src/world_entities/weapons/bomb.cc

@@ -21 +21 @@
 #include "vector.h"
 #include "fast_factory.h"
+
+#include "object_manager.h"
 
 
@@ -105 +107 @@
   Vector v = this->velocity * (time);
   this->shiftCoor(v);
+  /////////////////////////////////////////////////////////////////////////////////////////
+  // TESTING THE OBJECT MANAGER  //////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////////////////////////////
+
+  std::list<WorldEntity*>* objList = ObjectManager::distanceFromObject(*this, 100, CL_NPC);
+  std::list<WorldEntity*>::const_iterator detonator;
+  for (detonator = objList->begin(); detonator != objList->end(); ++detonator)
+  {
+//    printf("%d\n", strlen((*detonator)->getName()));
+    (*detonator)->collidesWith(this, Vector(0,0,0));
+
+  }
+  /////////////////////////////////////////////////////////////////////////////////////////
 
   this->lifeCycle += time/this->lifeSpan;
@@ -146 +161 @@
 void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
 {
-        this->detonate();
+        this->detonate();
 }
 
@@ -168 +183 @@
   while(lm != NULL)
   {
-   
+
     lm = it->nextElement();
   }

branches/old.we/src/world_entities/weapons/bomb.h

@@ -35 +35 @@
 
  private:
-  static FastFactory*               fastFactory;
-  static ParticleSystem*            trailParticles;
-  static ParticleSystem*            explosionParticles;
+   static FastFactory*               fastFactory;
+   static ParticleSystem*            trailParticles;
+   static ParticleSystem*            explosionParticles;
 
-  ParticleEmitter*                  emitter;
+   ParticleEmitter*                  emitter;
 
 };