Changeset 6222 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Dec 21, 2005, 1:49:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/world_entities/weapons/aim.cc (modified) (2 diffs)
• src/world_entities/weapons/bomb.cc (modified) (1 diff)
• src/world_entities/weapons/guided_missile.cc (modified) (1 diff)
• src/world_entities/weapons/laser.cc (modified) (1 diff)
• src/world_entities/weapons/rocket.cc (modified) (1 diff)
• src/world_entities/weapons/test_bullet.cc (modified) (1 diff)
• src/world_entities/weapons/test_gun.cc (modified) (1 diff)
• src/world_entities/weapons/turret.cc (modified) (1 diff)

trunk/src/world_entities/weapons/aim.cc

@@ -21 +21 @@
 #include "graphics_engine.h"
 #include "state.h"
-#include "list.h"
 #include "material.h"
 #include "t_animation.h"
@@ -104 +103 @@
 void Aim::searchTarget(float range)
 {
-  //FIXME//
-/*  tIterator<WorldEntity>* iterator = State::getWorldEntityList()->getIterator();
-  WorldEntity* entity = iterator->firstElement();
-  while (likely(entity != NULL))
+  std::list<WorldEntity*>::iterator entity;
+
+  for (entity = State::getObjectManager()->getObjectList(OM_GROUP_00).begin();
+       entity != State::getObjectManager()->getObjectList(OM_GROUP_00).end();
+       entity ++)
   {
-    if (entity->isA(CL_NPC) && this->source->getAbsCoor().x < entity->getAbsCoor().x && (this->source->getAbsCoor() - entity->getAbsCoor()).len() < range)
+    if (this->source->getAbsCoor().x < (*entity)->getAbsCoor().x && (this->source->getAbsCoor() - (*entity)->getAbsCoor()).len() < range)
     {
-      if (this->getParent() != entity)
+      if (this->getParent() != (*entity))
       {
         this->anim->replay();
-        this->setParentSoft(entity, 5);
+        this->setParentSoft(*entity, 5);
+        return;
       }
-      delete iterator;
-      return;
     }
-    entity = iterator->nextElement();
   }
-
-  delete iterator;*/
 }
 

trunk/src/world_entities/weapons/bomb.cc

@@ -21 +21 @@
 
 #include "fast_factory.h"
-#include "list.h"
+
 
 #include "object_manager.h"

trunk/src/world_entities/weapons/guided_missile.cc

@@ -20 +20 @@
 #include "fast_factory.h"
 
-#include "model.h"
 #include "state.h"
-#include "list.h"
 #include "class_list.h"
 

trunk/src/world_entities/weapons/laser.cc

@@ -21 +21 @@
 
 #include "state.h"
-#include "list.h"
 #include "class_list.h"
 #include "model.h"

trunk/src/world_entities/weapons/rocket.cc

@@ -20 +20 @@
 #include "fast_factory.h"
 
-#include "model.h"
 #include "state.h"
-#include "list.h"
 #include "class_list.h"
 

trunk/src/world_entities/weapons/test_bullet.cc

@@ -20 +20 @@
 #include "fast_factory.h"
 
-#include "model.h"
 #include "state.h"
-#include "list.h"
 #include "class_list.h"
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -29 +29 @@
 #include "factory.h"
 
-#include "vector.h"
-#include "list.h"
 #include "animation3d.h"
 

trunk/src/world_entities/weapons/turret.cc

@@ -23 +23 @@
 
 #include "state.h"
-#include "list.h"
 #include "animation3d.h"