Changeset 6634 in orxonox.OLD for trunk/src/lib/network/network_stream.cc

Timestamp:

Jan 21, 2006, 1:18:19 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

File:

• trunk/src/lib/network/network_stream.cc (modified) (3 diffs)

trunk/src/lib/network/network_stream.cc

@@ -78 +78 @@
   this->connectionMonitor = new ConnectionMonitor();
   this->networkSockets.push_back( NULL );
+  this->networkSockets[0] = NULL; //TODO: remove this
   this->handshakes.push_back( NULL );
   this->bActive = true;
@@ -266 +267 @@
             if ( networkSockets[i] != NULL )
             {
-              PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever);
+              PRINTF(5)("write %d bytes to socket %d\n", dataLength, i);
               networkSockets[i]->writePacket(downBuffer, dataLength);
             }
@@ -310 +311 @@
             if ( (*it)->writeBytes(upBuffer+sizeof(header), dataLength, i) != header.length )
             {
-              PRINTF(1)("%s did not read all the data!\n", (*it)->getClassName());
+              PRINTF(1)("%s did not read all the data id = %d!\n", (*it)->getClassName(), (*it)->getUniqueID());
               break;
             }