Changeset 8096 in orxonox.OLD for branches/network/src/world_entities

Timestamp:

Jun 1, 2006, 6:36:55 PM (18 years ago)

Author:

rennerc

Message:

teamchoice works now

Location:

branches/network/src/world_entities

Files:

• playable.cc (modified) (2 diffs)
• player.cc (modified) (1 diff)

branches/network/src/world_entities/playable.cc

@@ -79 +79 @@
   // this->setPlayer(NULL);
   // IN ITS DESTRUCTOR.
+  detachCamera();
   assert(this->currentPlayer == NULL);
 }
@@ -281 +282 @@
  */
 void  Playable::detachCamera()
-{}
+{
+  PRINTF(0)("detach camera\n");
+  if ( (PNode*)(State::getCameraTarget()) == this )
+  {
+    PRINTF(0)("lookAt nullParent\n");
+    
+    State::getCameraNode()->setParentSoft(PNode::getNullParent());
+    State::getCameraTargetNode()->setParentSoft(PNode::getNullParent());
+    
+    State::getCamera()->lookAt( PNode::getNullParent() );
+  }
+}
 
 

branches/network/src/world_entities/player.cc

@@ -81 +81 @@
       return true;
   }
+  
+  if ( playable == NULL )
+    this->playable = NULL;
 
   return true;