Changeset 10591 for code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.h

Timestamp:

Sep 17, 2015, 3:32:50 PM (9 years ago)

Author:

fvultier

Message:

Different wave types with different enemies. New field type: obstacle. It is impossible to build a tower on a field with an obstacle.

File:

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

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

@@ -61 +61 @@
         void payCredit(int pay){ this->credit_ -= pay; }
         int getLifes(){ return this->lifes_; }
-        int getWaveNumber(){ return this->waves_; }
+        int getWaveNumber(){ return this->waveNumber_; }
+        void setWaveNumber(int wavenumber){ waveNumber_=wavenumber; }
         void setCredit(int credit){ credit_ = credit; }
-        void setLifes(int lifes){ lifes_ = lifes; }
-        void setWaveNumber(int wavenumber){ waves_=wavenumber; }
-        void buyTower(int cost){ credit_ -= cost;}
+        void setLifes(int lifes){ lifes_ = lifes; }        
+        void buyTower(int cost){ cost -= cost;}
         void addCredit(int credit) { credit_+=credit; }
-        void nextwave(){ enemies_.clear(); waves_++; time=0;}
         int reduceLifes(int NumberofLifes){ return lifes_-=NumberofLifes; }
         TowerDefenseField* getField(TDCoordinate* coord){ return fields_[coord->GetX()][coord->GetY()]; }
-        /*  Called by TowerDefenseCenterpoint upon game start
-            The centerpoint is used to create towers
-        */
         void setCenterpoint(TowerDefenseCenterpoint* centerpoint);        
-        /* Adds a tower at x, y in the playfield */
         void addTower(int x, int y);
         void upgradeTower(int x, int y); 
         virtual TDCoordinate* getNextStreetCoord(TDCoordinate*);
-
-        //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
-        //virtual void playerScored(PlayerInfo* player, int score);
-
+        
         TowerDefenseSelecter* selecter;        
 
-        //TODO: void spawnNewWave()
-        //TODO: create a timer which regularly calls the spawnNewWave function  (time driven)
-        //      or spawn a new wave when the old wave has been killed           (event driven)
+    private:
+        void createFields();
 
-    private:
         orxonox::WeakPtr<TowerDefenseCenterpoint> center_;
         PlayerInfo* player_;
-        float time;        
+        float timeSinceLastSpawn_;
+        float timeUntilNextWave_;
+        int waveSize_;
         int credit_;
-        int waves_;
+        int waveNumber_;
         int lifes_;
-        Timer nextwaveTimer_;
         std::list<orxonox::WeakPtr<TowerDefenseEnemy> > enemies_;
         TowerDefenseField* fields_[16][16];
         std::vector<orxonox::WeakPtr<TowerDefenseField> > waypoints_;
         Vector3 endpoint_;
-
-        void createFields();
+        Vector3 offset_;        
     };
 }