Changeset 1711 for code/branches/network/src/network/Client.cc

Timestamp:

Sep 5, 2008, 11:32:42 PM (16 years ago)

Author:

scheusso

Message:

we use enetcallback for destroying packets now (unfortunately there are still some problems)

File:

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

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

@@ -123 +123 @@
   }
   
-  bool Client::sendChat(packet::Chat *chat){
+  /*bool Client::sendChat(packet::Chat *chat){
     chat->process();
     packet::Packet *p = new packet::Packet(chat);
     return p->send();
-  }
+  }*/
   
 
@@ -139 +139 @@
     if(!isConnected)
       return false;
-    packet::Packet p(new packet::Chat(message, clientID_));
-    return p.send();
-      //return client_connection.sendPackets();
+    packet::Chat chat(message, 0);
+    return chat.send();
     // send packets
   }
@@ -155 +154 @@
       if(gs){
         COUT(4) << "client tick: sending gs " << gs << std::endl;
-        packet::Packet packet(gs);
-        if( !packet.send() )
+        if( !gs->send() )
           COUT(3) << "Problem adding partial gamestate to queue" << std::endl;
-        // now delete it to save memory
-        delete gs;
+        // gs gets automatically deleted by enet callback
       }
     }
@@ -167 +164 @@
       event = client_connection.getEvent();
       COUT(5) << "tick packet size " << event->packet->dataLength << std::endl;
-      packet::Packet packet(event->packet, event->peer);
-      assert(packet.getPacketContent()->process());
+      packet::Packet *packet = packet::Packet::createPacket(event->packet, event->peer);
+      assert(packet->process());
     }
     int gameStateID = gamestate.processGamestates();
@@ -174 +171 @@
       if(gameStateFailure_){
         packet::Acknowledgement ack(GAMESTATEID_INITIAL, 0);
-        packet::Packet packet(&ack);
-        if(!packet.send())
+        if(!ack.send())
           COUT(3) << "could not (negatively) ack gamestate" << std::endl;
         else 
@@ -188 +184 @@
       gameStateFailure_=false;
       packet::Acknowledgement ack(gameStateID, 0);
-      packet::Packet packet(&ack);
-      if(!packet.send())
+      if(!ack.send())
         COUT(3) << "could not ack gamestate" << std::endl;
     }// otherwise we had no gamestate to load