Changeset 1248 for code/branches/network3/src/network/Client.cc

Timestamp:

May 8, 2008, 11:53:58 AM (16 years ago)

Author:

scheusso

Message:

some enhanced memory handling

File:

• code/branches/network3/src/network/Client.cc (modified) (9 diffs)

code/branches/network3/src/network/Client.cc

@@ -84 +84 @@
     // set server address to localhost
     isConnected=false;
-    test_once=false;
+    isSynched_=false;
   }
 
@@ -94 +94 @@
   Client::Client(std::string address, int port) : client_connection(port, address){
     isConnected=false;
-    test_once=false;
+    isSynched_=false;
   }
 
@@ -104 +104 @@
   Client::Client(const char *address, int port) : client_connection(port, address){
     isConnected=false;
-    test_once=false;
+    isSynched_=false;
   }
 
@@ -229 +229 @@
   */
   void Client::tick(float time){
-    if(client_connection.isConnected()){
+    if(client_connection.isConnected() && isSynched_){
       COUT(4) << "popping partial gamestate: " << std::endl;
       GameStateCompressed *gs = gamestate.popPartialGameState();
@@ -246 +246 @@
       packet = client_connection.getPacket();
       COUT(5) << "tick packet size " << packet->dataLength << std::endl;
-      if(!test_once){
-        elaborate(packet, 0); // ================= i guess we got to change this .... (client_ID is always same = server)
-      }
+      elaborate(packet, 0); // ================= i guess we got to change this .... (client_ID is always same = server)
     }
     if(!client_connection.sendPackets())
@@ -256 +254 @@
 
   void Client::processGamestate( GameStateCompressed *data, int clientID){
-    if(!test_once){
-      int id = data->id;
-      COUT(5) << "received gamestate id: " << data->id << std::endl;
-      if(gamestate.pushGameState(data)){
-        client_connection.addPacket(pck_gen.acknowledgement(id));
+    int id = data->id;
+    COUT(5) << "received gamestate id: " << data->id << std::endl;
+    if(gamestate.pushGameState(data)){
+      if(!isSynched_)
+        isSynched_=true;
+      client_connection.addPacket(pck_gen.acknowledgement(id));
         // we do this at the end of a tick
-//        if(!client_connection.sendPackets())
-//          COUT(2) << "Could not send acknowledgment" << std::endl;
-      }
-//       test_once=true;
+       if(!client_connection.sendPackets())
+         COUT(2) << "Could not send acknowledgment" << std::endl;
     }
   }
@@ -275 +272 @@
       id->setNetworkID(clid->clid);
     COUT(4) << "Client: received and set network id: " << clid->clid << "; classname: " << clid->message << std::endl;
+    delete clid;
     return;
   }
@@ -280 +278 @@
   void Client::processChat( chat *data){
     COUT(0) << "Server: " << data->message << std::endl;
+    delete[] data->message;
+    delete data;
   }
   
@@ -286 +286 @@
     clientID_ = w->clientID;
     shipID_ = w->shipID;
+    delete w;
     return true;
   }