Changeset 8015 in orxonox.OLD

Timestamp:

May 31, 2006, 10:43:16 AM (18 years ago)

Author:

rennerc

Message:

simplified bandwidth calculation

Location:

branches/network/src

Files:

• lib/network/connection_monitor.cc (modified) (3 diffs)
• story_entities/multi_player_world_data.cc (modified) (1 diff)

branches/network/src/lib/network/connection_monitor.cc

@@ -75 +75 @@
   
   // count zero bytes
-  int nZeroBytes = 0;
-  
-  for ( int i = 0; i < length; i++ )
-    if ( data[i] == '\0' )
-      nZeroBytes++;
+  //int nZeroBytes = 0;
+  
+  //for ( int i = 0; i < length; i++ )
+  //  if ( data[i] == '\0' )
+  //    nZeroBytes++;
   
   //NETPRINTF(n)( "ZEROBYTES: %d (%f%%)\n", nZeroBytes, ((float)100)*nZeroBytes/length );
@@ -145 +145 @@
   for ( std::map<int,int>::iterator it = packetHistory.begin(); it != packetHistory.end(); it++ )
   {
-    res += it->second;
+    if ( it != packetHistory.begin() )
+      res += it->second;
   }
   
@@ -151 +152 @@
     res = 0.0f;
   else
-    res /= (float)((tick - packetHistory.begin()->first)*( 1 + 1/((float)(packetHistory.size()-1)) ));
+    res /= (float)(tick - packetHistory.begin()->first);
   
   res *= 1000.0f;

branches/network/src/story_entities/multi_player_world_data.cc

@@ -270 +270 @@
   GameWorldData::loadScene(root);
   
+  // create server playable
   if ( NetworkManager::getInstance()->isGameServer() )
   {