Changeset 10587

Timestamp:

Sep 15, 2015, 4:43:03 PM (9 years ago)

Author:

landauf

Message:

use list instead of vector - list is better suited for removing elements

Location:

code/branches/towerdefenseFabien/src/modules/towerdefense

Files:

• TowerDefense.cc (modified) (2 diffs)
• TowerDefense.h (modified) (1 diff)

code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc

@@ -320 +320 @@
         //if ships are at the end they get destroyed
 
-        std::vector<orxonox::WeakPtr<TowerDefenseEnemy> >::iterator itBegin = enemies_.begin();
-        std::vector<orxonox::WeakPtr<TowerDefenseEnemy> >::iterator it = itBegin;
-        std::vector<orxonox::WeakPtr<TowerDefenseEnemy> >::iterator itEnd = enemies_.end();
-
-        while(it != itEnd)
+        for (std::list<WeakPtr<TowerDefenseEnemy> >::iterator it = enemies_.begin(); it != enemies_.end(); )
         {
             //destroys enemys at the end of the path and reduces the life by 1. No credits gifted
@@ -331 +327 @@
             if(distance < 50)
             {
-                std::vector<orxonox::WeakPtr<TowerDefenseEnemy> >::iterator itTemp = it;
-                ++ it;
                 orxout() << "enemy deleted" << endl;                
-                enemies_.erase(itTemp);
-                (*itTemp)->destroy();
+                (*it)->destroy();
+                enemies_.erase(it++);
                 this->reduceLifes(1);
                 if (this->getLifes() == 0)

code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.h

@@ -96 +96 @@
         int lifes_;
         Timer nextwaveTimer_;
-        std::vector<orxonox::WeakPtr<TowerDefenseEnemy> > enemies_;
+        std::list<orxonox::WeakPtr<TowerDefenseEnemy> > enemies_;
         TowerDefenseField* fields_[16][16];
         std::vector<orxonox::WeakPtr<TowerDefenseField> > waypoints_;