- Timestamp:
- Apr 26, 2010, 5:02:49 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ai/src/orxonox/controllers/ArtificialController.h
r6696 r6795 47 47 void abandonTarget(Pawn* target); 48 48 49 inline void setTeam(int team) //new49 inline void setTeam(int team) 50 50 { this->team_ = team; } 51 51 inline int getTeam() const 52 52 { return this->team_; } 53 virtual void changedControllableEntity(); 53 54 54 55 … … 61 62 enum State {SLAVE, MASTER, FREE}; 62 63 int getState(); 63 std::list<ArtificialController*> slaves ;64 std::list<ArtificialController*> slaves_; 64 65 void unregisterSlave(); 65 66 void searchNewMaster(); 66 67 void commandSlaves(); 68 void setNewMasterWithinFormation(); 67 69 void freeAllSlaves(); 68 70 void loseMasterState(); … … 89 91 90 92 91 State state_; //new master: 1 slave: -1 free: 092 int team_; //new93 State state_; 94 int team_; 93 95 94 96 private:
Note: See TracChangeset
for help on using the changeset viewer.