Changeset 12182 for code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.h

Timestamp:

Dec 11, 2018, 6:20:24 PM (5 years ago)

Author:

merholzl

Message:

RD merge

Location:

code/branches/Merge_HS18

Files:

• . (modified) (1 prop)
• src/modules/towerdefense/TowerDefense.h (modified) (4 diffs)

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

@@ -32 +32 @@
 #include "TDCoordinate.h"
 #include "TowerDefenseSelecter.h"
+#include "TowerDefenseController.h"
 #include "towerdefense/TowerDefensePrereqs.h"
 #include "gametypes/TeamDeathmatch.h"
@@ -37 +38 @@
 #include "util/Output.h"
 #include "TowerDefenseField.h"
+#include "TowerDefenseRangeViewer.h"
 
 namespace orxonox
 {
+    using EnemyList = std::list<std::pair<orxonox::WeakPtr<TowerDefenseEnemy>, TowerDefenseController*>>;
+
     /**
     @brief
@@ -73 +77 @@
         virtual TDCoordinate* getNextStreetCoord(TDCoordinate*);
         
-        TowerDefenseSelecter* selecter;        
+        TowerDefenseSelecter* selecter;   
+        TowerDefenseRangeViewer* rangeViewer;     
 
     private:
@@ -86 +91 @@
         int waveNumber_;
         int lifes_;
-        std::list<orxonox::WeakPtr<TowerDefenseEnemy>> enemies_;
+        EnemyList enemies_;
         TowerDefenseField* fields_[16][16];
         std::vector<orxonox::WeakPtr<TowerDefenseField>> waypoints_;