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

Timestamp:

May 7, 2008, 4:39:42 PM (16 years ago)

Author:

scheusso

Message:

different enhancements in input/network handling and synchronisation

File:

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

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

@@ -84 +84 @@
     // set server address to localhost
     isConnected=false;
+    test_once=false;
   }
 
@@ -93 +94 @@
   Client::Client(std::string address, int port) : client_connection(port, address){
     isConnected=false;
+    test_once=false;
   }
 
@@ -102 +104 @@
   Client::Client(const char *address, int port) : client_connection(port, address){
     isConnected=false;
+    test_once=false;
   }
 
@@ -226 +229 @@
   */
   void Client::tick(float time){
+    if(client_connection.isConnected()){
+      COUT(4) << "popping partial gamestate: " << std::endl;
+      GameStateCompressed *gs = gamestate.popPartialGameState();
+      if(gs){
+        COUT(4) << "client tick: sending gs " << gs << std::endl;
+        if(client_connection.addPacket(pck_gen.gstate(gs)))
+          if(!client_connection.sendPackets())
+            COUT(3) << "Problem sending partial gamestate" << std::endl;
+        // now delete it to save memory
+        delete [] gs->data;
+        delete gs;
+      }
+    }
     ENetPacket *packet;
     // stop if the packet queue is empty
@@ -231 +247 @@
       packet = client_connection.getPacket();
       COUT(5) << "tick packet size " << packet->dataLength << std::endl;
-      elaborate(packet, 0); // ================= i guess we got to change this .... (client_ID is always same = server)
+      if(!test_once){
+        elaborate(packet, 0); // ================= i guess we got to change this .... (client_ID is always same = server)
+      }
     }
     return;
   }
 
-  void Client::processGamestate( GameStateCompressed *data){
-    int id = data->id;
-    COUT(5) << "received gamestate id: " << data->id << std::endl;
-    if(gamestate.pushGameState(data)){
-      client_connection.addPacket(pck_gen.acknowledgement(id));
-      if(!client_connection.sendPackets())
-        COUT(2) << "Could not send acknowledgment" << std::endl;
+  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));
+        if(!client_connection.sendPackets())
+          COUT(2) << "Could not send acknowledgment" << std::endl;
+      }
+//       test_once=true;
     }
   }
@@ -263 +284 @@
     clientID_ = w->clientID;
     shipID_ = w->shipID;
-    
+    return true;
   }