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

Timestamp:

Sep 6, 2008, 3:16:11 PM (16 years ago)

Author:

scheusso

Message:

further bugfixes concerning packet handling

File:

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

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

@@ -111 +111 @@
     packetMap_[enetPacket_] = this;
   }
+  /*switch( *(ENUM::Type *)(data_ + _PACKETID) )
+  {
+    case ENUM::Acknowledgement:
+    case ENUM::Chat:
+    case ENUM::ClassID:
+    case ENUM::Gamestate:
+    case ENUM::Welcome:
+      COUT(3) << "welcome" << std::endl;
+      p = new Welcome( data, clientID );
+    default:
+      assert(0); //TODO: repair this
+      break;
+  }*/
   network::Host::addPacket( enetPacket_, clientID_);
   enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet
@@ -121 +134 @@
   Packet *p;
   COUT(3) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl;
-  switch( *(ENUM::Type *)&data[_PACKETID] )
+  switch( *(ENUM::Type *)(data + _PACKETID) )
   {
     case ENUM::Acknowledgement:
@@ -138 +151 @@
       COUT(3) << "gamestate" << std::endl;
       // TODO: remove brackets
-      p = new Gamestate( data, true, clientID );
+      p = new Gamestate( data, clientID );
       break;
     case ENUM::Welcome:
       COUT(3) << "welcome" << std::endl;
       p = new Welcome( data, clientID );
+      break;
     default:
       assert(0); //TODO: repair this