Changeset 656

Timestamp:

Dec 19, 2007, 1:33:30 PM (17 years ago)

Author:

scheusso

Message:

some errors corrected in gamestatehandling

Location:

code/branches/FICN/src/network

Files:

• ClientConnection.h (modified) (1 diff)
• GameStateManager.cc (modified) (1 diff)
• Synchronisable.cc (modified) (3 diffs)

code/branches/FICN/src/network/ClientConnection.h

@@ -28 +28 @@
 #define NETWORK_PORT 55556
 #define NETWORK_CLIENT_MAX_CONNECTIONS 5
-#define NETWORK_CLIENT_TIMEOUT 5
+#define NETWORK_CLIENT_TIMEOUT 10
 #define NETWORK_SEND_WAIT 5
 #define NETWORK_CLIENT_CHANNELS 2

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

@@ -126 +126 @@
 
     // run Synchronisable::getData with offset and additional place for 3 ints in between (for ids and length)
-    sync=it->getData(retval->data+offset+3*sizeof(int));
+    sync=it->getData((retval->data)+offset+3*sizeof(int));
     *(retval->data+offset)=sync.length;
     *(retval->data+offset+sizeof(int))=sync.objectID;

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

@@ -110 +110 @@
   retVal.objectID=this->objectID;
   retVal.classID=this->classID;
-  retVal.length=datasize;
+  retVal.length=getSize();
   retVal.data=mem;
   // copy to location
@@ -117 +117 @@
     //COUT(2) << "size of variable: " << i->size << std::endl;
     //(std::memcpy(retVal.data+n, (const void*)(&(i->size)), sizeof(int));
-    *((int *)(retVal.data+n)) = i->size;
+    memcpy( (void *)(retVal.data+n), (const void*)&(i->size), sizeof(int) );
     n+=sizeof(int);
     switch(i->type){
       case DATA:
-        std::memcpy(retVal.data+n, (const void*)(i->var), i->size);
+        std::memcpy( (void *)(retVal.data+n), (const void*)(i->var), i->size);
         n+=i->size;
         break;
@@ -172 +172 @@
     switch(i->type){
     case DATA:
+      tsize+=sizeof(int);
       tsize+=i->size;
       break;
     case STRING:
+      tsize+=sizeof(int);
       tsize+=((std::string *)i->var)->length()+1;
       break;