Changeset 1710 for code/branches/network/src/network/packet

Timestamp:

Sep 5, 2008, 12:27:37 PM (17 years ago)

Author:

scheusso

Message:

further errors corrected (mostly double frees, etc)

Location:

code/branches/network/src/network/packet

Files:

• Gamestate.cc (modified) (1 diff)
• Gamestate.h (modified) (2 diffs)
• Packet.cc (modified) (3 diffs)

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

@@ -80 +80 @@
   
   //start write gamestate header
+  HEADER->packetType = ENUM::Gamestate;
   HEADER->normsize = currentsize;
   HEADER->id = id;

code/branches/network/src/network/packet/Gamestate.h

@@ -28 +28 @@
 
 #include "PacketContent.h"
+#include "Packet.h"
 #include "network/Synchronisable.h"
 //#include "util/Bytestream.h"
@@ -40 +41 @@
   
 struct GamestateHeader{
+  ENUM::Type packetType;
   int id; // id of the gamestate
   unsigned int compsize;

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

@@ -41 +41 @@
   packetContent_ = createPacketContent(packet);
   enet_packet_destroy(packet);
-  delete peer;
 }
 
 Packet::~Packet(){
-  if(packetContent_)
-    delete packetContent_;
   if(enetPacket_){
     enet_packet_destroy(enetPacket_);
@@ -66 +63 @@
     if(!packetContent_)
       return false;
-    COUT(3) << "creating packet with data: " << packetContent_->getData() << " size: " << packetContent_->getSize() << " and flags: " << packetContent_->getFlags() << std::endl;
     enetPacket_ = enet_packet_create(packetContent_->getData(), packetContent_->getSize(), packetContent_->getFlags());
   }
@@ -92 +88 @@
       break;
     default:
-      assert(0);
+      assert(0); //TODO: repair this
+      break;
   }
   return packetContent_;