Changeset 2041 for code/branches/objecthierarchy/src/orxonox/objects/infos/PlayerInfo.cc

Timestamp:

Oct 29, 2008, 12:48:11 AM (16 years ago)

Author:

landauf

Message:

bugs—
network++
endurance—
tiredness++

but it still doesn't work properly
(commit because oli is very impatient)

File:

• code/branches/objecthierarchy/src/orxonox/objects/infos/PlayerInfo.cc (modified) (3 diffs)

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

@@ -71 +71 @@
         REGISTERSTRING(this->name_,                 network::direction::toclient, new network::NetworkCallback<PlayerInfo>(this, &PlayerInfo::changedName));
         REGISTERDATA  (this->controllableEntityID_, network::direction::toclient, new network::NetworkCallback<PlayerInfo>(this, &PlayerInfo::networkcallback_changedcontrollableentityID));
+        REGISTERDATA  (this->bReadyToSpawn_,        network::direction::toserver);
     }
 
@@ -127 +128 @@
             this->controllableEntityID_ = network::OBJECTID_UNKNOWN;
         }
-
+COUT(0) << this->getObjectID() << ": PI: start control" << std::endl;
         if (this->controller_)
             this->controller_->setControllableEntity(entity);
     }
 
-    void PlayerInfo::stopControl(ControllableEntity* entity)
+    void PlayerInfo::stopControl(ControllableEntity* entity, bool callback)
     {
         if (entity && this->controllableEntity_ == entity)
@@ -142 +143 @@
                 this->controller_->setControllableEntity(0);
 
-            entity->removePlayer();
+            if (callback)
+                entity->removePlayer();
         }
     }