Changeset 10151

Timestamp:

Dec 3, 2014, 5:06:11 PM (10 years ago)

Author:

erbj

Message:

waves added

Location:

code/branches/towerdefenseHS14/src/modules/towerdefense

Files:

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

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

@@ -299 +299 @@
         path.push_back(coord1);
 
-            if(time>1 && TowerDefenseEnemyvector.size() < 30)
-            {
-                addTowerDefenseEnemy(path, rand() %3 +1 ); 
-                time = time-1;
-            }
+        if(time>1 && TowerDefenseEnemyvector.size() < 30)
+        {
+            addTowerDefenseEnemy(path, rand() %3 +1 );
+            time = time-1;
+        }
+
+        Vector3* endpoint = new Vector3(500, 700, 150);
+
+        for(int i =0; i < TowerDefenseEnemyvector.size(); ++i)
+        {
+
+                //orxout() << TowerDefenseEnemyvector.at(i) << endl;
+                //continue;
+
+                        //ArtificialController* controller = (ArtificialController*)this->getController();
+                        if(TowerDefenseEnemyvector.at(i) != NULL && TowerDefenseEnemyvector.at(i)->isAlive())
+                        {
+                                orxout() << "Variable i: " << i << endl;
+
+                                Vector3 ship = TowerDefenseEnemyvector.at(i)->getRVWorldPosition();
+
+                                float distance = ship.distance(*endpoint);
+
+                                //orxout() << "distance" << distance << endl;
+                                if(distance <50){
+                                  //    orxout() << "ENEMY KILLED!!!!" << endl;
+                                  TowerDefenseEnemyvector.at(i)->destroy();
+                                }
+                        }
+                        else
+                        {
+                                //TowerDefenseEnemyvector.erase(TowerDefenseEnemyvector.begin() +i);
+                        }
+                }
+
+        int count= 0;
+        for(int i =0; i < TowerDefenseEnemyvector.size(); ++i)
+        {
+                if(TowerDefenseEnemyvector.at(i)!= NULL)
+                {
+                        ++count;
+                }
+        }
+
+        if(count== 0)
+        {
+                time2 +=dt;
+                if(time2 > 10)
+                {
+                        TowerDefenseEnemyvector.clear();
+                        time=0;
+                        time2=0;
+                }
+        }
+
 
 

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

@@ -54 +54 @@
         virtual ~TowerDefense();
 
-        std::vector<TowerDefenseEnemy*> TowerDefenseEnemyvector;
+        std::vector<orxonox::WeakPtr<TowerDefenseEnemy> > TowerDefenseEnemyvector;
         bool towermatrix[16][16];
         void addTowerDefenseEnemy(std::vector<TDCoordinate*> path, int templatenr); 
@@ -89 +89 @@
         TowerDefenseCenterpoint *center_;
         float time;
+        float time2;
 
         /* handles stats */

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -42 +42 @@
         SUPER(TowerDefenseEnemy, tick, dt);
 
-        //ArtificialController* controller = (ArtificialController*)this->getController();
-        Vector3 ship = this->getRVWorldPosition();
-        Vector3* endpoint = new Vector3(500, 700, 150);
-
-        float distance = ship.distance(*endpoint);
-
-        //orxout() << "distance" << distance << endl;
-        if(distance <50){
-        //      orxout() << "ENEMY KILLED!!!!" << endl;
-                this->destroy(); }
     }