- Timestamp:
- Dec 14, 2011, 2:38:37 PM (13 years ago)
- Location:
- code/branches/presentation2011
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2011
- Property svn:mergeinfo changed
/code/branches/gamecontent (added) merged: 8893,8895,8899-8901,8904,8907,8909-8910,8922-8924,8930,8932,8941-8942,8950-8951,8956
- Property svn:mergeinfo changed
-
code/branches/presentation2011/src/orxonox/controllers/ArtificialController.h
r8891 r8980 51 51 void abandonTarget(Pawn* target); 52 52 53 inline void setTeam(int team) 53 inline void setTeam(int team) //TODO: write through to controllable entity. 54 54 { this->team_ = team; } 55 55 inline int getTeam() const
Note: See TracChangeset
for help on using the changeset viewer.