Changeset 6301 in orxonox.OLD

Timestamp:

Dec 26, 2005, 12:47:14 PM (19 years ago)

Author:

rennerc

Message:

 

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (4 diffs)
• network_game_manager.h (modified) (3 diffs)
• network_protocol.cc (modified) (1 diff)
• network_stream.cc (modified) (2 diffs)

branches/network/src/lib/network/network_game_manager.cc

@@ -50 +50 @@
 
   newUniqueID = MAX_CONNECTIONS + 2;
+
+  hasRequestedWorld = false;
 }
 
@@ -73 +75 @@
   byte b;
 
-  while ( i<length-1 )
+  while ( i<length )
   {
     b = data[i++];
@@ -135 +137 @@
     }
 
+    if ( b == REQUEST_ENTITY_LIST )
+    {
+      PRINTF(0)("sending THE list\n");
+      sendEntityList( sender );
+      continue;
+    }
+
     //if we get her something with data is wrong
     PRINTF(1)("Data is not in the right format! i=%d\n", i);
@@ -143 +152 @@
 int NetworkGameManager::readBytes(byte* data, int maxLength, int * reciever)
 {
+  if ( !isServer() && !hasRequestedWorld )
+  {
+    SYNCHELP_WRITE_BEGIN();
+    byte b = REQUEST_ENTITY_LIST;
+    SYNCHELP_WRITE_BYTE( b );
+    hasRequestedWorld = true;
+    return SYNCHELP_WRITE_N;
+  }
   for ( int i = 0; i<outBuffer.size(); i++ )
   {

branches/network/src/lib/network/network_game_manager.h

@@ -31 +31 @@
  *  //REQUEST_CREATE_LIST: NUMBER, [UNIQUE_ID][0..NUMBER]
  *
+ *  REQUEST_ENTITY_LIST: //request the whole world :D
  *  REQUEST_SYNC:        UNIQUE_ID
  *  //REQUEST_SYNC_LIST:   NUMBER, [UNIQUE_ID][0..NUMBER]
@@ -46 +47 @@
   REQUEST_REMOVE,
   REQUEST_SYNC,
-  YOU_ARE_ENTITY
+  YOU_ARE_ENTITY,
+  REQUEST_ENTITY_LIST
 };
 
@@ -122 +124 @@
 
     int                           newUniqueID;
+    bool                          hasRequestedWorld;
 };
 

branches/network/src/lib/network/network_protocol.cc

@@ -97 +97 @@
   PRINTF(5)("extract Header\n");
   //Test if received data can contain a header
-  if (length < headerLength)
+  if (length < 2*INTSIZE)
   {
     PRINTF(1)("Received data is to short; it can't contain a header!\n");

branches/network/src/lib/network/network_stream.cc

@@ -187 +187 @@
           else
           {
-            this->networkGameManager->sendEntityList( i );
+            //this->networkGameManager->sendEntityList( i );
           }
           PRINT(0)("handshake finished id=%d\n", handshakes[i]->getNetworkGameManagerId());
@@ -232 +232 @@
         if ( header->synchronizeableID < this->maxConnections+2 )
         {
-          PRINTF(0)("RESET UNIQUEID TO 0\n");
+          if ( !isServer() ) PRINTF(0)("RESET UNIQUEID TO 0\n");
           header->synchronizeableID = 0;
         }
         else
         {
-          PRINTF(0)("UNIQUEID=%d\n", header->synchronizeableID);
+          if ( !isServer() ) PRINTF(0)("UNIQUEID=%d\n", header->synchronizeableID);
         }