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

Timestamp:

Nov 26, 2005, 2:20:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ClassList is now in std::list style
ShellCommand is now in std::list style

Location:

trunk/src/world_entities/weapons

Files:

• aim.cc (modified) (1 diff)
• guided_missile.cc (modified) (2 diffs)
• laser.cc (modified) (1 diff)
• rocket.cc (modified) (2 diffs)
• test_bullet.cc (modified) (2 diffs)
• weapon_manager.cc (modified) (3 diffs)
• weapon_manager.h (modified) (1 diff)

trunk/src/world_entities/weapons/aim.cc

@@ -81 +81 @@
 
   this->text = new Text();
+  this->text->setLayer(this->getLayer());
   this->text->setParent2D(this);
   this->text->setRelCoor2D(10, -50);

trunk/src/world_entities/weapons/guided_missile.cc

@@ -66 +66 @@
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (GuidedMissile::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (GuidedMissile::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
   {
     if (ClassList::exists(GuidedMissile::trailParticles, CL_PARTICLE_SYSTEM))
@@ -72 +72 @@
     GuidedMissile::trailParticles = NULL;
   }
-  if (GuidedMissile::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (GuidedMissile::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
   {
     if (ClassList::exists(GuidedMissile::explosionParticles, CL_PARTICLE_SYSTEM))

trunk/src/world_entities/weapons/laser.cc

@@ -63 +63 @@
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (Laser::explosionParticles != NULL && ClassList::getList(CL_LASER)->getSize() <= 1)
+  if (Laser::explosionParticles != NULL && ClassList::getList(CL_LASER)->size() <= 1)
   {
     //if (ClassList::exists(Laser::explosionParticles, CL_PARTICLE_SYSTEM))

trunk/src/world_entities/weapons/rocket.cc

@@ -62 +62 @@
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (Rocket::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (Rocket::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
   {
     if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM))
@@ -68 +68 @@
     Rocket::trailParticles = NULL;
   }
-  if (Rocket::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (Rocket::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
   {
     if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM))

trunk/src/world_entities/weapons/test_bullet.cc

@@ -62 +62 @@
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (TestBullet::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (TestBullet::trailParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
   {
     if (ClassList::exists(TestBullet::trailParticles, CL_PARTICLE_SYSTEM))
@@ -68 +68 @@
     TestBullet::trailParticles = NULL;
   }
-  if (TestBullet::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (TestBullet::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->size() <= 1)
   {
     if (ClassList::exists(TestBullet::explosionParticles, CL_PARTICLE_SYSTEM))

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -347 +347 @@
    if (this->targetIterator == NULL)
    {
-     tList<BaseObject>* npcList = ClassList::getList(CL_NPC);
+     std::list<BaseObject*>* npcList = ClassList::getList(CL_NPC);
      if (npcList != NULL)
      {
-       this->targetIterator = npcList->getIterator();
-       this->targetIterator->firstElement();
+       this->targetIterator = npcList->begin();
      }
      else
@@ -357 +356 @@
    }
 
-   PNode* retNode = dynamic_cast<PNode*>(targetIterator->nextElement());
-   if (retNode == NULL && this->targetIterator->getList()->getSize() > 0)
-     retNode =  dynamic_cast<PNode*>(targetIterator->firstElement());
+   ///FIXME
+//   this->targetIterator++;
+   PNode* retNode = dynamic_cast<PNode*>((*targetIterator));
+//   if (retNode == NULL && this->targetIterator->getList()->getSize() > 0)
+//     retNode =  dynamic_cast<PNode*>(targetIterator->firstElement());
 
    return retNode;
@@ -372 +373 @@
 PNode* WeaponManager::getDistanceTarget(const PNode* carrier, float distance)
 {
-  tList<BaseObject>* npcList = ClassList::getList(CL_NPC);
+  std::list<BaseObject*>* npcList = ClassList::getList(CL_NPC);
   if (npcList != NULL)
   {
-    tIterator<BaseObject>* npcIT = npcList->getIterator();
-    PNode* tmpNPC = dynamic_cast<PNode*>(npcIT->firstElement());
-    while (tmpNPC != NULL)
-    {
-      if ((carrier->getAbsCoor() - tmpNPC->getAbsCoor()).len() < distance)
-      {
-        delete npcIT;
-        return tmpNPC;
-      }
-      tmpNPC = dynamic_cast<PNode*>(npcIT->nextElement());
-    }
-    delete npcIT;
+    list<BaseObject*>::iterator node;
+    for (node= npcList->begin(); node != npcList->end(); node++)
+      if ((carrier->getAbsCoor() - dynamic_cast<PNode*>(*node)->getAbsCoor()).len() < distance)
+        return dynamic_cast<PNode*>(*node);
   }
   return this->getFixedTarget();
-
 }
 

trunk/src/world_entities/weapons/weapon_manager.h

@@ -110 +110 @@
     tAnimation<Crosshair>*  crossHairSizeAnim;                        //!< An animation for the crosshair (scaling)
 
-    tIterator<BaseObject>*  targetIterator;                           //!< An iterator for traversion lists of enemies.
+    std::list<BaseObject*>::iterator  targetIterator;                           //!< An iterator for traversion lists of enemies.
 };