Changeset 2042 for code/branches/objecthierarchy/src/orxonox/objects/infos

Timestamp:

Oct 29, 2008, 3:26:55 AM (16 years ago)

Author:

landauf

Message:

added camerapositions

Location:

code/branches/objecthierarchy/src/orxonox/objects/infos

Files:

• HumanPlayer.cc (modified) (5 diffs)
• PlayerInfo.cc (modified) (1 diff)

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

@@ -54 +54 @@
         this->setConfigValues();
         this->registerVariables();
-
-COUT(0) << this->getObjectID() << ": HumanPlayer created" << std::endl;
-        network::Synchronisable* temp = dynamic_cast<network::Synchronisable*>(creator);
-        if (temp)
-        {
-COUT(0) << this->getObjectID() << ": CreatorID: " << temp->getObjectID() << std::endl;
-        }
-        else
-        {
-COUT(0) << this->getObjectID() << ": Creator is no Synchronisable" << std::endl;
-        }
-    unsigned int creatorID = network::OBJECTID_UNKNOWN;
-    searchcreatorID:
-    if (creator)
-    {
-        if (creator->isA(Class(Synchronisable)))
-        {
-            Synchronisable* synchronisable_creator = dynamic_cast<Synchronisable*>(creator);
-            creatorID = synchronisable_creator->getObjectID();
-        }
-        else if (creator != creator->getCreator())
-        {
-            creator = creator->getCreator();
-            goto searchcreatorID;
-        }
-    }
-COUT(0) << this->getObjectID() << ": ### tranmitted creatorID: " << creatorID << std::endl;
     }
 
     HumanPlayer::~HumanPlayer()
     {
-COUT(0) << this->getObjectID() << ": HumanPlayer destroyed" << std::endl;
     }
 
@@ -120 +92 @@
     void HumanPlayer::networkcallback_clientIDchanged()
     {
-COUT(0) << this->getObjectID() << ": PI: clientID changed to " << this->clientID_ << std::endl;
         if (this->clientID_ == network::Host::getPlayerID())
         {
-COUT(0) << this->getObjectID() << ": PI: it's my clientID" << std::endl;
             this->bLocalPlayer_ = true;
             this->synchronize_nick_ = this->nick_;
@@ -129 +99 @@
 
             if (!Core::isMaster())
-            {
                 this->setObjectMode(network::direction::bidirectional);
-COUT(0) << this->getObjectID() << ": PI: set objectmode to bidirectional" << std::endl;
-            }
             else
                 this->setName(this->nick_);
@@ -143 +110 @@
     {
         this->client_ready_ = true;
-COUT(0) << this->getObjectID() << ": PI: server ready, client set ready too" << std::endl;
     }
 
     void HumanPlayer::networkcallback_client_ready()
     {
-COUT(0) << this->getObjectID() << ": PI: client ready" << std::endl;
         if (this->getGametype())
-        {
-COUT(0) << this->getObjectID() << ": PI: adding client to gametype" << std::endl;
             this->getGametype()->playerEntered(this);
-        }
     }
 
@@ -173 +135 @@
     void HumanPlayer::setClientID(unsigned int clientID)
     {
-COUT(0) << this->getObjectID() << ": PI: set clientID to " << clientID << std::endl;
         this->clientID_ = clientID;
         this->networkcallback_clientIDchanged();

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

@@ -128 +128 @@
             this->controllableEntityID_ = network::OBJECTID_UNKNOWN;
         }
-COUT(0) << this->getObjectID() << ": PI: start control" << std::endl;
+
         if (this->controller_)
             this->controller_->setControllableEntity(entity);