Changeset 6412 for code/branches/pickup2/src/libraries/network/Client.cc

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/libraries/network/Client.cc (modified) (6 diffs)

code/branches/pickup2/src/libraries/network/Client.cc

@@ -62 +62 @@
   Client::Client():
       isSynched_(false),
-      gameStateFailure_(false)
+      gameStateFailure_(false),
+      timeSinceLastUpdate_(0)
   {
   }
@@ -73 +74 @@
   Client::Client(const std::string& address, int port):
       isSynched_(false),
-      gameStateFailure_(false)
+      gameStateFailure_(false),
+      timeSinceLastUpdate_(0)
   {
       setPort( port );
@@ -112 +114 @@
   }
 
+  void Client::printRTT(){
+    COUT(0) << "Round trip time to server is " << ClientConnection::getRTT() << " ms" << endl;
+  }
+
   /**
    * This function implements the method of sending a chat message to the server
@@ -133 +139 @@
     {
       timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;
-      //     COUT(3) << ".";
+      //     COUT(3) << '.';
       if ( isConnected() && isSynched_ )
       {
@@ -149 +155 @@
     }
     sendPackets(); // flush the enet queue
-    
+
     Connection::processQueue();
     if(gamestate.processGamestates())
@@ -157 +163 @@
     }
     gamestate.cleanup();
+    Connection::sendPackets();
 
     return;
   }
-  
+
   void Client::connectionClosed()
   {