Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 7, 2015, 8:34:20 AM (8 years ago)
Author:
gania
Message:

check in

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h

    r10915 r10923  
    3535#include "../modules/pickup/PickupSpawner.h"
    3636#include <map>
    37 
    3837
    3938
    … …  
    246245                bool bFirstTick_;
    247246
    248                 void setSpawners();
     247              /*  void setSpawners();
    249248                Vector3 bestHealthPickup (float searchRadius);
    250249                // Point closestPickup(PickupType::Value pickupType);
    … …  
    252251                std::multimap <int, std::pair<PickupSpawner*, bool> > damageSpawners_;
    253252                std::multimap <int, std::pair<PickupSpawner*, bool> > speedSpawners_;
    254 
     253*/
    255254                float timeOffset_;
    256255                bool bActionCalled_;
    … …  
    262261                bool bDefaultPatrol_;
    263262                bool stop_;
     263                static int sTicks_;
     264                static int nextActionpointControllerId_;
     265                int actionpointControllerId_;
     266                int ticks_;
     267
    264268
    265269        private:
Note: See TracChangeset for help on using the changeset viewer.