Changeset 10589

Timestamp:

Sep 15, 2015, 4:48:24 PM (9 years ago)

Author:

landauf

Message:

enemies can be killed by towers → the WeakPtr returns NULL → remove enemy from list

File:

• code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc (modified) (1 diff)

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

@@ -322 +322 @@
         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
-            Vector3 ship = (*it)->getRVWorldPosition();
-            float distance = ship.distance(endpoint_);
-            if(distance < 50)
-            {
-                orxout() << "enemy deleted" << endl;                
-                (*it)->destroy();
+            if (*it == NULL)
+            {
+                // the enemy was destroyed by a tower - remove it from the list
                 enemies_.erase(it++);
-                this->reduceLifes(1);
-                if (this->getLifes() == 0)
+            }
+            else
+            {
+                //destroys enemys at the end of the path and reduces the life by 1. No credits gifted
+                Vector3 ship = (*it)->getRVWorldPosition();
+                float distance = ship.distance(endpoint_);
+                if(distance < 50)
                 {
-                    this->end();
+                    orxout() << "enemy deleted" << endl;
+                    (*it)->destroy();
+                    enemies_.erase(it++);
+                    this->reduceLifes(1);
+                    if (this->getLifes() == 0)
+                    {
+                        this->end();
+                    }
                 }
-            }
-            else
-            {
-                ++ it;
+                else
+                {
+                    ++ it;
+                }
             }
         }