Changeset 9160

Timestamp:

May 4, 2012, 4:12:47 PM (13 years ago)

Author:

mentzerf

Message:

• Fixed height of towers

+ not adding towers when they were added already

Location:

code/branches/newlevel2012/src/modules/towerdefense

Files:

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

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

@@ -150 +150 @@
         }
         
+        bool TowerDefense::hasTower(int x, int y)
+        {
+                for(std::vector<coordinate>::iterator it = addedTowersCoordinates_.begin(); it != addedTowersCoordinates_.end(); ++it) 
+                {
+                        coordinate currentCoordinates = (coordinate) (*it);
+                        if (currentCoordinates.x == x && currentCoordinates.y == y)
+                                return true;
+                }
+                
+                return false;
+        }
         
         void TowerDefense::addTower(int x, int y)
         {
+                if (this->hasTower(x,y))
+                {
+                        orxout() << "tower exists!!" << endl;
+                        return;
+                }
+                
+                coordinate newTowerCooridnates;
+                newTowerCooridnates.x = x; newTowerCooridnates.y = y;
+                addedTowersCoordinates_.push_back(newTowerCooridnates);
+                
                 unsigned int width = this->center_->getWidth();
                 unsigned int height = this->center_->getHeight();
@@ -158 +179 @@
                 
                 orxout() << "tile scale = " << tileScale << endl;
+                
+                
                 
                 if (x > 15 || y > 15 || x < 0 || y < 0)
@@ -173 +196 @@
                 this->center_->attach(newTower);
                 
-                newTower->setPosition((x-8) * tileScale, (y-8) * tileScale, 0);
+                newTower->setPosition((x-8) * tileScale, (y-8) * tileScale, 100);
                 newTower->setGame(this);
+                
                 //TODO: Save the Tower in a Vector. I would suggest std::vector< std::vector<Tower*> > towers_ as a protected member variable;
                 

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

@@ -78 +78 @@
 //              WeakPtr<TowerDefenseCenterpoint> center_;
                 TowerDefenseCenterpoint *center_;
+        
+        
+                bool hasTower(int x, int y);
+                
+                typedef struct {
+                        int x;
+                        int y;
+                } coordinate; 
+                
+        
+                
+                std::vector<coordinate> addedTowersCoordinates_;
+                std::vector<Tower*> towers_;
                 
                 void addWaypointsAndFirstEnemy();