Changeset 6868 in orxonox.OLD for trunk/src/lib

Timestamp:

Jan 30, 2006, 4:41:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Network back to the trunk.
merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6817:HEAD
no conflicts

Location:

trunk/src/lib/network

Files:

• network_game_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (1 diff)
• synchronizeable.h (modified) (4 diffs)

trunk/src/lib/network/network_game_manager.cc

@@ -575 +575 @@
     if ( (*it)->getUniqueID() == uniqueID )
     {
-      delete *it;
+      assert((*it)->isA(CL_WORLD_ENTITY));
+      dynamic_cast<WorldEntity*>(*it)->toList(OM_DEAD);
       break;
     }

trunk/src/lib/network/network_stream.cc

@@ -263 +263 @@
         if ( reciever!=0 )
         {
-          if ( networkSockets[reciever] != NULL )
-          {
-            PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever);
-            networkSockets[reciever]->writePacket(downBuffer, dataLength);
+          if ( reciever < 0)
+          {
+            for ( int i = 0; i<networkSockets.size(); i++)
+            {
+              if ( i!=-reciever && networkSockets[i] != NULL )
+              {
+                PRINTF(5)("write %d bytes to socket %d\n", dataLength, i);
+                networkSockets[i]->writePacket(downBuffer, dataLength);
+              }
+            }
           }
           else
           {
-            PRINTF(1)("networkSockets[reciever] == NULL\n");
+            if ( networkSockets[reciever] != NULL )
+            {
+              PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever);
+              networkSockets[reciever]->writePacket(downBuffer, dataLength);
+            }
+            else
+            {
+              PRINTF(1)("networkSockets[reciever] == NULL\n");
+            }
           }
         }

trunk/src/lib/network/synchronizeable.h

@@ -33 +33 @@
   NWT_SS_VELY,
   NWT_SS_VELZ,
+  NWT_SS_PL_SYNC,
   
   NWT_HS_HOST_ID,
   NWT_HS_NGM_ID,
+  
+  NWT_PL_FLAGS,
   
   NWT_PN_BO_WRITESTATE,
@@ -101 +104 @@
  * with the same argument names!
  *
+ * id is one int out of that enum on top of this comment it is used to identify
+ * read/write. when you read a value you have to use exactly the same as you used
+ * to write or you will see an assertion failing.
+ *
  * SYNCHELP_WRITE_BEGIN()
- * SYNCHELP_WRITE_INT(i)
- * SYNCHELP_WRITE_FLOAT(f)
- * SYNCHELP_WRITE_BYTE(b)
- * SYNCHELP_WRITE_STRING(s)
+ * SYNCHELP_WRITE_INT(i,id)
+ * SYNCHELP_WRITE_FLOAT(f,id)
+ * SYNCHELP_WRITE_BYTE(b,id)
+ * SYNCHELP_WRITE_STRING(s,id)
  * SYNCHELP_WRITE_N
  *
  * SYNCHELP_READ_BEGIN()
- * SYNCHELP_READ_INT(i)
- * SYNCHELP_READ_FLOAT(f)
- * SYNCHELP_READ_STRING(s,l) l = size of buffer s
- * SYNCHELP_READ_STRINGM(s)  allocates memory for string! you have to free this after
- * SYNCHELP_READ_BYTE(b)
+ * SYNCHELP_READ_INT(i,id)
+ * SYNCHELP_READ_FLOAT(f,id)
+ * SYNCHELP_READ_STRING(s,l,id) l = size of buffer s
+ * SYNCHELP_READ_STRINGM(s,id)  allocates memory for string! you have to delete this later
+ * SYNCHELP_READ_BYTE(b,id)
+ * SYNCHELP_READ_REMAINING() returns the remaining buffer size
+ * SYNCHELP_READ_NEXTBYTE()  reads the next byte but it is not removed from the buffer
  * SYNCHELP_READ_N
  *
@@ -122 +131 @@
  *  SYNCHELP_READ_FLOAT(size);
  *  SYNCHELP_READ_STRING( textureName, 1024 ); //1024 is the length of textureName
+ *  delete[] textureName;
+ *  textureName = NULL;
+ *  SYNCHELP_READ_STRINGM( texturename );      //this will call new char[strlen()+1] 
  *
  * Example 2:
@@ -130 +142 @@
  *
  */
+ 
 #define SYNCHELP_WRITE_DEBUG(n) {\
   __synchelp_write_n = Converter::intToByteArray( n, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \