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

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/worldentities

Files:

• ControllableEntity.cc (modified) (2 diffs)
• pawns/Pawn.cc (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -81 +81 @@
         if (this->isInitialized())
         {
-            if (this->bHasLocalController_)
+            if (this->bHasLocalController_ && this->bHasHumanController_)
                 this->stopLocalHumanControl();
 
@@ -250 +250 @@
     void ControllableEntity::stopLocalHumanControl()
     {
-        this->camera_->detachFromParent();
-        delete this->camera_;
-        this->camera_ = 0;
-
-        delete this->hud_;
-        this->hud_ = 0;
+        if (this->camera_)
+        {
+            this->camera_->detachFromParent();
+            delete this->camera_;
+            this->camera_ = 0;
+        }
+
+        if (this->hud_)
+        {
+            delete this->hud_;
+            this->hud_ = 0;
+        }
     }
 

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -160 +160 @@
         this->bAlive_ = false;
 
+        this->setDestroyWhenPlayerLeft(false);
+
         if (this->getGametype())
             this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
-
-        this->setDestroyWhenPlayerLeft(false);
 
         if (this->getPlayer())