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

Timestamp:

Nov 18, 2009, 1:34:14 PM (14 years ago)

Author:

scheusso

Message:

changes in PlayerInfo and Rocket (and scene)
not yet working in network though

File:

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

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

@@ -92 +92 @@
         private:
             void networkcallback_changedcontrollableentityID();
+            void networkcallback_changedtemporarycontrollableentityID();
             void networkcallback_changedgtinfoID();
             void updateGametypeInfo();
@@ -98 +99 @@
             Controller* controller_;
             ControllableEntity* controllableEntity_;
-            WeakPtr<ControllableEntity> oldControllableEntity_;
+            ControllableEntity* temporaryControllableEntity_;
             unsigned int controllableEntityID_;
+            unsigned int temporaryControllableEntityID_;
 
             const GametypeInfo* gtinfo_;