Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 21, 2019, 3:02:00 PM (18 months ago)
Author:
merholzl
Message:

TD merge

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/modules/towerdefense/TowerDefense.h

    r11099 r12190  
    3232#include "TDCoordinate.h"
    3333#include "TowerDefenseSelecter.h"
     34#include "TowerDefenseController.h"
    3435#include "towerdefense/TowerDefensePrereqs.h"
    3536#include "gametypes/TeamDeathmatch.h"
     
    3738#include "util/Output.h"
    3839#include "TowerDefenseField.h"
     40#include "TowerDefenseRangeViewer.h"
    3941
    4042namespace orxonox
    4143{
     44    using EnemyList = std::list<std::pair<orxonox::WeakPtr<TowerDefenseEnemy>, TowerDefenseController*>>;
     45
    4246    /**
    4347    @brief
     
    7377        virtual TDCoordinate* getNextStreetCoord(TDCoordinate*);
    7478       
    75         TowerDefenseSelecter* selecter;       
     79        TowerDefenseSelecter* selecter;   
     80        TowerDefenseRangeViewer* rangeViewer;     
    7681
    7782    private:
     
    8691        int waveNumber_;
    8792        int lifes_;
    88         std::list<orxonox::WeakPtr<TowerDefenseEnemy>> enemies_;
     93        EnemyList enemies_;
    8994        TowerDefenseField* fields_[16][16];
    9095        std::vector<orxonox::WeakPtr<TowerDefenseField>> waypoints_;
Note: See TracChangeset for help on using the changeset viewer.