Changeset 2438 for code/branches/objecthierarchy2/src/orxonox/objects/infos

Timestamp:

Dec 14, 2008, 3:53:05 AM (16 years ago)

Author:

landauf

Message:

• If the player dies, the Spectator spawns at the same position the players camera was before.
• Fixed some related problems and potential bugs

Location:

code/branches/objecthierarchy2/src/orxonox/objects/infos

Files:

• PlayerInfo.cc (modified) (2 diffs)
• PlayerInfo.h (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc

@@ -115 +115 @@
     }
 
-    void PlayerInfo::startControl(ControllableEntity* entity)
+    void PlayerInfo::startControl(ControllableEntity* entity, bool callback)
     {
         if (entity == this->controllableEntity_)
@@ -121 +121 @@
 
         if (this->controllableEntity_)
-            this->stopControl(this->controllableEntity_);
+            this->stopControl(this->controllableEntity_, callback);
 
         this->controllableEntity_ = entity;

code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.h

@@ -65 +65 @@
                 { return this->bReadyToSpawn_; }
 
-            void startControl(ControllableEntity* entity);
+            void startControl(ControllableEntity* entity, bool callback = true);
             void stopControl(ControllableEntity* entity, bool callback = true);