Changeset 12190 for code/trunk/src/modules/towerdefense/TowerDefense.h
- Timestamp:
- Feb 21, 2019, 3:02:00 PM (5 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/TowerDefense_HS18 (added) merged: 12025,12038,12125-12126,12137,12153,12165
- Property svn:mergeinfo changed
-
code/trunk/src/modules/towerdefense/TowerDefense.h
r11099 r12190 32 32 #include "TDCoordinate.h" 33 33 #include "TowerDefenseSelecter.h" 34 #include "TowerDefenseController.h" 34 35 #include "towerdefense/TowerDefensePrereqs.h" 35 36 #include "gametypes/TeamDeathmatch.h" … … 37 38 #include "util/Output.h" 38 39 #include "TowerDefenseField.h" 40 #include "TowerDefenseRangeViewer.h" 39 41 40 42 namespace orxonox 41 43 { 44 using EnemyList = std::list<std::pair<orxonox::WeakPtr<TowerDefenseEnemy>, TowerDefenseController*>>; 45 42 46 /** 43 47 @brief … … 73 77 virtual TDCoordinate* getNextStreetCoord(TDCoordinate*); 74 78 75 TowerDefenseSelecter* selecter; 79 TowerDefenseSelecter* selecter; 80 TowerDefenseRangeViewer* rangeViewer; 76 81 77 82 private: … … 86 91 int waveNumber_; 87 92 int lifes_; 88 std::list<orxonox::WeakPtr<TowerDefenseEnemy>>enemies_;93 EnemyList enemies_; 89 94 TowerDefenseField* fields_[16][16]; 90 95 std::vector<orxonox::WeakPtr<TowerDefenseField>> waypoints_;
Note: See TracChangeset
for help on using the changeset viewer.