Changeset 1360 for code/trunk/src/network/Client.cc

Timestamp:

May 22, 2008, 2:02:06 PM (16 years ago)

Author:

rgrieder

Message:

merged merge branch back to trunk

File:

• code/trunk/src/network/Client.cc (modified) (3 diffs)

code/trunk/src/network/Client.cc

@@ -120 +120 @@
     isConnected=client_connection.createConnection();
     if(isConnected){
-      COUT(4) << "sending connectrequest" << std::endl;
-      client_connection.addPacket(pck_gen.generateConnectRequest());
-      client_connection.sendPackets();
+      COUT(3) << "sending connectrequest" << std::endl;
+      if(!client_connection.addPacket(pck_gen.generateConnectRequest()) || !client_connection.sendPackets())
+        COUT(1) << "could not create connection" << std::endl;
     }else
       COUT(1) << "could not create connection" << std::endl;
@@ -229 +229 @@
   */
   void Client::tick(float time){
+//     COUT(3) << ".";
     if(client_connection.isConnected() && isSynched_){
       COUT(4) << "popping partial gamestate: " << std::endl;
@@ -260 +261 @@
       if(!isSynched_)
         isSynched_=true;
-      client_connection.addPacket(pck_gen.acknowledgement(id));
+      if(!client_connection.addPacket(pck_gen.acknowledgement(id)))
+        return;
         // we do this at the end of a tick
-       if(!client_connection.sendPackets())
-         COUT(2) << "Could not send acknowledgment" << std::endl;
+      if(!client_connection.sendPackets())
+        COUT(2) << "Could not send acknowledgment" << std::endl;
     }
   }