Changeset 567

Timestamp:

Dec 17, 2007, 11:16:50 AM (17 years ago)

Author:

scheusso

Message:

some minor changes/enhancements in GameStateClient

Location:

code/branches/FICN/src

Files:

• network/GameStateClient.cc (modified) (1 diff)
• orxonox/objects/BaseEntity.cc (modified) (1 diff)
• orxonox/objects/WorldEntity.cc (modified) (1 diff)
• orxonox/objects/WorldEntity.h (modified) (1 diff)

code/branches/FICN/src/network/GameStateClient.cc

@@ -91 +91 @@
         ((Synchronisable *)no)->classID=sync.classID;
         it=orxonox::ObjectList<Synchronisable>::end();
+        // update data and create object/entity...
+        if( !(((Synchronisable *)no)->updateData(sync)) && !(((Synchronisable *)no)->create()) )
+          COUT(0) << "We couldn't create/update the object: " << sync.objectID << std::endl;
+        ++it;
       }
     } else {

code/branches/FICN/src/orxonox/objects/BaseEntity.cc

@@ -42 +42 @@
    
    void BaseEntity::registerAllVariables(){
+     WorldEntity::registerAllVariables();
      registerVar(&name_, name_.length()+1, network::STRING);
      registerVar(&mesh_, mesh_.length()+1, network::STRING);

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -76 +76 @@
     
     void WorldEntity::registerAllVariables(){
-      
+      // to be implemented !
       
     }

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -101 +101 @@
           { return this->node_->getOrientation(); }
       
+    protected:
+      void registerAllVariables();
+      
     private:
-      void registerAllVariables();
       Ogre::SceneNode* node_;
       static unsigned int worldEntityCounter_s;