Changeset 6082 for code/branches/particles2/src/orxonox/infos/PlayerInfo.h

Timestamp:

Nov 17, 2009, 10:57:44 PM (14 years ago)

Author:

scheusso

Message:

some fixes in Rocket
there are two new function ins PlayerInfo: startTemporaryControl and stopTemporaryControl which expand start/stop-Control but without removing the player from the currently controlled controllable entity

File:

• code/branches/particles2/src/orxonox/infos/PlayerInfo.h (modified) (2 diffs)

code/branches/particles2/src/orxonox/infos/PlayerInfo.h

@@ -69 +69 @@
             void startControl(ControllableEntity* entity);
             void stopControl();
+            void startTemporaryControl(ControllableEntity* entity);
+            void stopTemporaryControl();
 
             inline ControllableEntity* getControllableEntity() const
@@ -96 +98 @@
             Controller* controller_;
             ControllableEntity* controllableEntity_;
+            WeakPtr<ControllableEntity> oldControllableEntity_;
             unsigned int controllableEntityID_;