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

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)

Location:

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

Files:

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

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

@@ -55 +55 @@
         this->registerVariables();
 
-        COUT(0) << "HumanPlayer created" << std::endl;
+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;
     }
 
@@ -94 +120 @@
     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_;
@@ -101 +129 @@
 
             if (!Core::isMaster())
+            {
                 this->setObjectMode(network::direction::bidirectional);
+COUT(0) << this->getObjectID() << ": PI: set objectmode to bidirectional" << std::endl;
+            }
             else
                 this->setName(this->nick_);
@@ -112 +143 @@
     {
         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);
+        }
     }
 
@@ -137 +173 @@
     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

@@ -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();
         }
     }

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

@@ -66 +66 @@
 
             void startControl(ControllableEntity* entity);
-            void stopControl(ControllableEntity* entity);
+            void stopControl(ControllableEntity* entity, bool callback = true);
 
             inline ControllableEntity* getControllableEntity() const