- Timestamp:
- May 24, 2011, 4:44:39 PM (13 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
-
code/branches/presentation/src/orxonox/infos/PlayerInfo.h
r7163 r8561 68 68 void startControl(ControllableEntity* entity); 69 69 void stopControl(); 70 void pauseControl(); 70 71 void startTemporaryControl(ControllableEntity* entity); 71 72 void stopTemporaryControl(); … … 98 99 Controller* controller_; 99 100 ControllableEntity* controllableEntity_; 100 ControllableEntity* oldControllableEntity_;101 std::vector< WeakPtr<ControllableEntity> > previousControllableEntity_; //!< List of the previous ControllableEntities if repeatedly startTemporary control was called. The ControllableEntity at the back is the most recent. 101 102 unsigned int controllableEntityID_; 102 103
Note: See TracChangeset
for help on using the changeset viewer.