Changeset 2836 for code/branches/netp2/src/network/ConnectionManager.cc

Timestamp:

Mar 23, 2009, 5:00:54 PM (16 years ago)

Author:

scheusso

Message:

merge old netp branch to netp2 (still because of multiplayer pong…)

File:

• code/branches/netp2/src/network/ConnectionManager.cc (modified) (4 diffs)

code/branches/netp2/src/network/ConnectionManager.cc

@@ -57 +57 @@
 {
   bool operator< (ENetAddress a, ENetAddress b) {
-    if(a.host <= b.host)
-      return true;
-    else
-      return false;
+    return a.host <= b.host;
   }
 }
@@ -198 +195 @@
         if(enet_host_service(server, event, NETWORK_WAIT_TIMEOUT)<0){
           // we should never reach this point
+          assert(0);
           quit=true;
           continue;
@@ -214 +212 @@
         case ENET_EVENT_TYPE_NONE:
           //receiverThread_->yield();
-          msleep(1);
+          msleep(10);
           break;
       }
@@ -266 +264 @@
   }
 
-  bool ConnectionManager::processData(ENetEvent *event) {
-    // just add packet to the buffer
-    // this can be extended with some preprocessing
-    return buffer.push(event);
-  }
-
-
 
   int ConnectionManager::getClientID(ENetPeer* peer) {