Changeset 1713 for code/branches/network/src/network/packet/Packet.cc

Timestamp:

Sep 6, 2008, 2:50:12 PM (16 years ago)

Author:

scheusso

Message:

some bugs fixed (packet handling)

File:

• code/branches/network/src/network/packet/Packet.cc (modified) (4 diffs)

code/branches/network/src/network/packet/Packet.cc

@@ -61 +61 @@
 
 void blub(ENetPacket *packet){
-  COUT(0) << "blubb" << std::endl;
+  COUT(4) << "blubb" << std::endl;
 }
 
 Packet::Packet(unsigned char *data, int clientID){
   flags_ = PACKET_FLAG_DEFAULT;
-  packetDirection_ = ENUM::Outgoing;
+  packetDirection_ = ENUM::Incoming;
   clientID_=clientID;
   data_=data;
@@ -72 +72 @@
 }
 
-Packet::Packet(ENetPacket *packet, ENetPeer *peer){
+/*Packet::Packet(ENetPacket *packet, ENetPeer *peer){
   packetDirection_ = ENUM::Incoming;
   enetPacket_ = packet;
   clientID_ = ClientInformation::findClient(&peer->address)->getID();
   data_ = packet->data;
-}
+}*/
 
 Packet::Packet(const Packet &p){
@@ -107 +107 @@
     }
     enetPacket_ = enet_packet_create(getData(), getSize(), getFlags());
+    //enetPacket_->freeCallback = &Packet::deletePacket;
     enetPacket_->freeCallback = &blub;
     packetMap_[enetPacket_] = this;
@@ -119 +120 @@
   unsigned int clientID = ClientInformation::findClient(&peer->address)->getID();
   Packet *p;
+  COUT(3) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl;
   switch( *(ENUM::Type *)&data[_PACKETID] )
   {
     case ENUM::Acknowledgement:
+      COUT(3) << "ack" << std::endl;
       p = new Acknowledgement( data, clientID );
       break;
     case ENUM::Chat:
+      COUT(3) << "chat" << std::endl;
       p = new Chat( data, clientID );
       break;
     case ENUM::ClassID:
+      COUT(3) << "classid" << std::endl;
       p = new ClassID( data, clientID );
       break;
     case ENUM::Gamestate:
+      COUT(3) << "gamestate" << std::endl;
       // TODO: remove brackets
       p = new Gamestate( data, true, clientID );
       break;
     case ENUM::Welcome:
+      COUT(3) << "welcome" << std::endl;
       p = new Welcome( data, clientID );
     default: