Changeset 9211

Timestamp:

May 18, 2012, 4:00:21 PM (12 years ago)

Author:

mentzerf

Message:

+ Now only adding tower if there is enough credit

Location:

code/branches/newlevel2012/src/modules/towerdefense

Files:

• TowerDefense.cc (modified) (4 diffs)
• TowerDefense.h (modified) (2 diffs)
• TowerDefensePlayerStats.h (modified) (2 diffs)

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

@@ -77 +77 @@
 #include "Tower.h"
 #include "TowerDefenseCenterpoint.h"
-#include "TowerDefensePlayerStats.h"
 
 #include "worldentities/SpawnPoint.h"
@@ -156 +155 @@
         }
         
-        bool TowerDefense::hasTower(int x, int y)
-        {
-                for(std::vector<coordinate>::iterator it = addedTowersCoordinates_.begin(); it != addedTowersCoordinates_.end(); ++it) 
+        void TowerDefense::addTower(int x, int y)
+        {
+                const TowerCost towerCost = TDDefaultTowerCost;
+                
+                if (!this->hasEnoughCreditForTower(towerCost))
                 {
-                        coordinate currentCoordinates = (coordinate) (*it);
-                        if (currentCoordinates.x == x && currentCoordinates.y == y)
-                                return true;
+                        orxout() << "not enough credit: " << (this->stats_->getCredit()) << " available, " << TDDefaultTowerCost << " needed.";
+                        return;
                 }
                 
-                return false;
-        }
-        
-        void TowerDefense::addTower(int x, int y)
-        {
-                if (this->hasTower(x,y))
+                if (this->towerExists(x,y))
                 {
                         orxout() << "tower exists!!" << endl;
                         return;
-                }
-                
-                coordinate newTowerCoordinates;
-                newTowerCoordinates.x = x; newTowerCoordinates.y = y;
-                addedTowersCoordinates_.push_back(newTowerCoordinates);
-                
+                }               
+                
+                /*
                 unsigned int width = this->center_->getWidth();
                 unsigned int height = this->center_->getHeight();
+                */
+                
                 int tileScale = (int) this->center_->getTileScale();
-                
-                orxout() << "tile scale = " << tileScale << endl;
                         
                 if (x > 15 || y > 15 || x < 0 || y < 0)
@@ -195 +187 @@
                 orxout() << "Will add tower at (" << (x-8) * tileScale << "," << (y-8) * tileScale << ")" << endl;
                 
+                // Add tower to coordinatesStack
+                Coordinate newTowerCoordinates = {x, y};
+                addedTowersCoordinates_.push_back(newTowerCoordinates);
+                
+                // Reduce credit
+                this->stats_->buyTower(towerCost);
+                
+                // Create tower
                 Tower* newTower = new Tower(this->center_);
                 newTower->addTemplate(this->center_->getTowerTemplate());
@@ -207 +207 @@
                 // TODO: load Tower mesh
         }
+        
+        bool TowerDefense::hasEnoughCreditForTower(TowerCost towerCost)
+        {
+                return ((this->stats_->getCredit()) >= towerCost);
+        }
+        
+        bool TowerDefense::towerExists(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::tick(float dt)

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

@@ -41 +41 @@
 #include "gametypes/Deathmatch.h"
                  
+ #include "TowerDefensePlayerStats.h"
+                 
 namespace orxonox
 {
@@ -81 +83 @@
                 /* handles stats */
                 TowerDefensePlayerStats *stats_;
+                bool hasEnoughCreditForTower(TowerCost towerCost);
         
-                bool hasTower(int x, int y);
+                bool towerExists(int x, int y);
                 
                 typedef struct {
                         int x;
                         int y;
-                } coordinate; 
+                } Coordinate; 
                 
         
                 
-                std::vector<coordinate> addedTowersCoordinates_;
+                std::vector<Coordinate> addedTowersCoordinates_;
                 std::vector<Tower*> towers_;
                 

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

@@ -42 +42 @@
 namespace orxonox
 {
+        typedef enum _TowerCosts {
+                TDDefaultTowerCost = 200
+        } TowerCost;
+        
     class _TowerDefenseExport TowerDefensePlayerStats
     {
@@ -52 +56 @@
                 inline void setCredit(int credit)
                         { credit_ = credit; }
+                
+                inline void buyTower(TowerCost cost)
+                        { credit_ -= cost;}
                 
                 inline int getWaveNumber()