Changeset 1946 for code/branches/objecthierarchy/src

Timestamp:

Oct 19, 2008, 3:23:52 AM (16 years ago)

Author:

landauf

Message:

synchronizes the players name

Location:

code/branches/objecthierarchy/src

Files:

• core/ConfigValueContainer.h (modified) (2 diffs)
• orxonox/objects/infos/PlayerInfo.cc (modified) (5 diffs)
• orxonox/objects/infos/PlayerInfo.h (modified) (2 diffs)

code/branches/objecthierarchy/src/core/ConfigValueContainer.h

@@ -52 +52 @@
 #include "util/MultiType.h"
 #include "ConfigFileManager.h"
+#include "Identifier.h"
 
 namespace orxonox
@@ -69 +70 @@
             inline virtual ~ConfigValueCallback() {}
             inline virtual void call(void* object)
-                { (((T*)object)->*this->function_)(); }
+                { if (!Identifier::isCreatingHierarchy()) { (((T*)object)->*this->function_)(); } }
 
         private:

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

@@ -58 +58 @@
         this->registerVariables();
 
-        COUT(0) << "created PlayerInfo" << std::endl;
+        COUT(0) << "created PlayerInfo (" << this->getObjectID() << ")" << std::endl;
     }
 
@@ -66 +66 @@
         if (gametype)
             gametype->removePlayer(this);
+        COUT(0) << "destroyed PlayerInfo (" << this->getObjectID() << ")" << std::endl;
     }
 
@@ -75 +76 @@
     void PlayerInfo::checkName()
     {
-std::cout << "# PlayerInfo: checkName: " << this->bLocalPlayer_ << std::endl;
-        if (this->bLocalPlayer_)
+std::cout << "# PI(" << this->getObjectID() << "): checkName: " << this->bLocalPlayer_ << std::endl;
+        if (this->bLocalPlayer_ && Settings::isMaster())
             this->setName(this->playerName_);
+    }
+
+    void PlayerInfo::changedName()
+    {
+std::cout << "# PI(" << this->getObjectID() << "): changedName to " << this->getName() << std::endl;
     }
 
     void PlayerInfo::registerVariables()
     {
-        this->setObjectMode(network::direction::bidirectional);
+        REGISTERSTRING(name_,         network::direction::toclient, new network::NetworkCallback<PlayerInfo>(this, &PlayerInfo::changedName));
+        REGISTERSTRING(playerName_,   network::direction::toserver, new network::NetworkCallback<PlayerInfo>(this, &PlayerInfo::clientChangedName));
+        REGISTERDATA(clientID_,       network::direction::toclient, new network::NetworkCallback<PlayerInfo>(this, &PlayerInfo::checkClientID));
+        REGISTERDATA(ping_,           network::direction::toclient);
+        REGISTERDATA(bHumanPlayer_,   network::direction::toclient);
+        REGISTERDATA(bFinishedSetup_, network::direction::bidirectional, new network::NetworkCallback<PlayerInfo>(this, &PlayerInfo::finishedSetup));
+    }
 
-        REGISTERSTRING(name_,               network::direction::bidirectional, new network::NetworkCallback<PlayerInfo>(this, &PlayerInfo::changedName));
-        REGISTERDATA(clientID_,             network::direction::toclient,      new network::NetworkCallback<PlayerInfo>(this, &PlayerInfo::checkClientID));
-        REGISTERDATA(ping_,                 network::direction::toclient);
-        REGISTERDATA(bHumanPlayer_,         network::direction::toclient);
-        REGISTERDATA(bFinishedSetup_,       network::direction::bidirectional, new network::NetworkCallback<PlayerInfo>(this, &PlayerInfo::finishedSetup));
+    void PlayerInfo::clientChangedName()
+    {
+std::cout << "# PI(" << this->getObjectID() << "): clientChangedName() to " << this->playerName_ << std::endl;
+        this->setName(this->playerName_);
     }
 
     void PlayerInfo::checkClientID()
     {
-std::cout << "# PlayerInfo: checkClientID" << std::endl;
+std::cout << "# PI(" << this->getObjectID() << "): checkClientID()" << std::endl;
         this->bHumanPlayer_ = true;
 
         if (this->clientID_ == network::Host::getPlayerID())
         {
-std::cout << "#             it's the client's ID" << std::endl;
+std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): it's the client's ID" << std::endl;
             this->bLocalPlayer_ = true;
-            this->setName(this->playerName_);
-std::cout << "#             " << this->getName() << std::endl;
+//std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): name: " << this->getName() << std::endl;
 
-            if (!Settings::isClient())
+            if (Settings::isClient())
             {
-std::cout << "#             not client: finish setup" << std::endl;
+std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): we're on a client: set object mode to bidirectional" << std::endl;
+                this->setObjectMode(network::direction::bidirectional);
+                this->playerName_ += "blub";
+std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): proposed name: " << this->playerName_ << std::endl;
+            }
+            else
+            {
+std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): we're not on a client: finish setup" << std::endl;
+                this->clientChangedName();
                 this->bFinishedSetup_ = true;
                 this->finishedSetup();
@@ -114 +132 @@
     void PlayerInfo::finishedSetup()
     {
-std::cout << "# PlayerInfo: finishedSetup: " << this->bFinishedSetup_ << std::endl;
+std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): " << this->bFinishedSetup_ << std::endl;
         if (Settings::isClient())
         {
-std::cout << "#             client: set to true" << std::endl;
+std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): we're a client: finish setup" << std::endl;
             this->bFinishedSetup_ = true;
         }
         else if (this->bFinishedSetup_)
         {
-std::cout << "#             not client but finished: add player" << std::endl;
+std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): we're a server: add player" << std::endl;
             Gametype* gametype = Gametype::getCurrentGametype();
             if (gametype)
@@ -129 +147 @@
         else
         {
-std::cout << "#             not client and not finished" << std::endl;
+std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): we're a server: client not yet finished" << std::endl;
         }
     }

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

@@ -45 +45 @@
             void registerVariables();
 
+            virtual void changedName();
+
             inline void setClientID(unsigned int clientID)
                 { this->clientID_ = clientID; this->checkClientID(); }
@@ -59 +61 @@
             void finishedSetup();
             void checkName();
+            void clientChangedName();
 
             unsigned int clientID_;