Changeset 1945 for code/branches

Timestamp:

Oct 19, 2008, 1:36:13 AM (16 years ago)

Author:

landauf

Message:

added option "forceCallback" to updateData(…) in Synchronisable to get a callback when synchronizing a variable for the first time (even if it didn't changed)

Location:

code/branches/objecthierarchy/src

Files:

• network/Synchronisable.cc (modified) (3 diffs)
• network/Synchronisable.h (modified) (1 diff)
• orxonox/objects/infos/PlayerInfo.cc (modified) (3 diffs)

code/branches/objecthierarchy/src/network/Synchronisable.cc

@@ -139 +139 @@
     COUT(3) << "fabricate objectID: " << no->objectID << " classID: " << no->classID << std::endl;
           // update data and create object/entity...
-    bool b = no->updateData(mem, mode);
+    bool b = no->updateData(mem, mode, true);
     assert(b);
     b = no->create();
@@ -297 +297 @@
    * @return true/false
    */
-  bool Synchronisable::updateData(uint8_t*& mem, int mode){
+  bool Synchronisable::updateData(uint8_t*& mem, int mode, bool forceCallback){
     if(mode==0x0)
       mode=state_;
@@ -349 +349 @@
       }
       // call the callback function, if defined
-      if(callback && (*i)->callback)
+      if((callback || forceCallback) && (*i)->callback)
         (*i)->callback->call();
     }

code/branches/objecthierarchy/src/network/Synchronisable.h

@@ -117 +117 @@
     bool getData(uint8_t*& men, unsigned int id, int mode=0x0);
     uint32_t getSize(unsigned int id, int mode=0x0);
-    bool updateData(uint8_t*& mem, int mode=0x0);
+    bool updateData(uint8_t*& mem, int mode=0x0, bool forceCallback=false);
     bool isMyData(uint8_t* mem);
     bool doSelection(unsigned int id);

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

@@ -73 +73 @@
     }
 
+    void PlayerInfo::checkName()
+    {
+std::cout << "# PlayerInfo: checkName: " << this->bLocalPlayer_ << std::endl;
+        if (this->bLocalPlayer_)
+            this->setName(this->playerName_);
+    }
+
     void PlayerInfo::registerVariables()
     {
@@ -84 +91 @@
     }
 
-    void PlayerInfo::checkName()
-    {
-        if (this->bLocalPlayer_)
-            this->setName(this->playerName_);
-    }
-
     void PlayerInfo::checkClientID()
     {
+std::cout << "# PlayerInfo: checkClientID" << std::endl;
         this->bHumanPlayer_ = true;
 
         if (this->clientID_ == network::Host::getPlayerID())
         {
+std::cout << "#             it's the client's ID" << std::endl;
             this->bLocalPlayer_ = true;
             this->setName(this->playerName_);
+std::cout << "#             " << this->getName() << std::endl;
 
             if (!Settings::isClient())
             {
+std::cout << "#             not client: finish setup" << std::endl;
                 this->bFinishedSetup_ = true;
                 this->finishedSetup();
@@ -109 +114 @@
     void PlayerInfo::finishedSetup()
     {
+std::cout << "# PlayerInfo: finishedSetup: " << this->bFinishedSetup_ << std::endl;
         if (Settings::isClient())
+        {
+std::cout << "#             client: set to true" << std::endl;
             this->bFinishedSetup_ = true;
+        }
         else if (this->bFinishedSetup_)
         {
+std::cout << "#             not client but finished: add player" << std::endl;
             Gametype* gametype = Gametype::getCurrentGametype();
             if (gametype)
                 gametype->addPlayer(this);
         }
+        else
+        {
+std::cout << "#             not client and not finished" << std::endl;
+        }
     }
 }