Changeset 1087 for code/branches/network

Timestamp:

Apr 17, 2008, 1:06:49 PM (17 years ago)

Author:

scheusso

Message:

some more debug output

Location:

code/branches/network/src/network

Files:

• GameStateClient.cc (modified) (1 diff)
• Synchronisable.cc (modified) (4 diffs)

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

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

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

@@ -118 +118 @@
     retVal.data=mem;
     // copy to location
-    int n=0;
+    int n=0; //offset
     for(i=syncList->begin(); n<datasize && i!=syncList->end(); ++i){
       //(std::memcpy(retVal.data+n, (const void*)(&(i->size)), sizeof(int));
@@ -129 +129 @@
         break;
       case STRING:
-        std::memcpy( retVal.data+n, (const void*)( ( (std::string *) (*i)->var)->c_str()), ( (std::string *)(*i)->var )->length()+1);
-        n+=((std::string *) (*i)->var)->length()+1;
+        std::memcpy( retVal.data+n, (const void*)( ( (std::string *) (*i)->var)->c_str()), (*i)->size);
+        n+=(*i)->size;
         break;
       }
@@ -149 +149 @@
       return false;
     }
-    COUT(5) << "Synchronisable: synchronising data" << std::endl;
-    i=syncList->begin();
-    COUT(5) << "element size: " << (*syncList->begin())->size << std::endl;
-    COUT(5) << "*i.size" << (*i)->size << std::endl;
-    for(; i!=syncList->end(); i++){
+    COUT(5) << "Synchronisable: objectID " << objectID << ", classID " << classID << " synchronising data" << std::endl;
+    for(i=syncList->begin(); i!=syncList->end(); i++){
+      COUT(5) << "element size: " << (*i)->size << " type: " << (*i)->type << std::endl;
       if(*(int *)data==(*i)->size || (*i)->type==STRING){
         switch((*i)->type){
-      case DATA:
-        data+=sizeof(int);
-        memcpy((void*)(*i)->var, data, (*i)->size);
-        data+=(*i)->size;
-        break;
-      case STRING:
-        (*i)->size = *(int *)data;
-        data+=sizeof(int);
-        *((std::string *)((*i)->var)) = std::string((const char*)data);
-        data += (*i)->size;
-        break;
+        case DATA:
+          data+=sizeof(int);
+          memcpy((void*)(*i)->var, data, (*i)->size);
+          data+=(*i)->size;
+          break;
+        case STRING:
+          (*i)->size = *(int *)data;
+          data+=sizeof(int);
+          *((std::string *)((*i)->var)) = std::string((const char*)data);
+          data += (*i)->size;
+          break;
         }
       } else
@@ -189 +187 @@
       case STRING:
         tsize+=sizeof(int);
-        tsize+=((std::string *)(*i)->var)->length()+1;
+        (*i)->size=((std::string *)(*i)->var)->length()+1;
+        tsize+=(*i)->size;
         break;
       }