Changeset 1709

Timestamp:

Sep 4, 2008, 10:47:04 PM (16 years ago)

Author:

scheusso

Message:

fixed messing up with enet

Location:

code/branches/network/src/network

Files:

• Server.cc (modified) (1 diff)
• packet/Packet.cc (modified) (3 diffs)
• packet/Packet.h (modified) (1 diff)
• packet/Welcome.cc (modified) (2 diffs)
• packet/Welcome.h (modified) (1 diff)

code/branches/network/src/network/Server.cc

@@ -265 +265 @@
         COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl; 
         temp->addFailure();
-        /*if(temp->getFailures() > 0 )
-          disconnectClient(temp);*/
-      //std::cout << "added gamestate" << std::endl;
       }else
         temp->resetFailures();

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

@@ -9 +9 @@
 #include "Chat.h"
 #include "ClassID.h"
+#include "Gamestate.h"
 #include "network/Host.h"
 #include "core/CoreIncludes.h"
@@ -39 +40 @@
   clientID_ = ClientInformation::findClient(&peer->address)->getID();
   packetContent_ = createPacketContent(packet);
-  delete packet;
+  enet_packet_destroy(packet);
   delete peer;
 }
@@ -88 +89 @@
     case ENUM::Gamestate:
       // TODO: remove brackets
-      // packetContent_ = new Gamestate( data );
+      packetContent_ = new Gamestate( data, true, clientID_ );
       break;
     default:

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

@@ -60 +60 @@
     Packet(PacketContent *content);
     Packet(ENetPacket *packet, ENetPeer *peer);
-    ~Packet();
+    virtual ~Packet();
     
     int getClientID(){ return clientID_; }

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

@@ -1 +1 @@
 #include "Welcome.h"
 #include "Packet.h"
+#include <assert.h>
 
 namespace network {
@@ -14 +15 @@
 {
   flags_ = flags_ | PACKET_FLAGS_CLASSID;
+  assert(getSize());
   data_=new unsigned char[ getSize() ];
-  if(!data_)
-    return;
+  assert(data_);
   *(packet::ENUM::Type *)&data_[ _PACKETID ] = packet::ENUM::Welcome;
   *(unsigned int *)&data_[ _CLIENTID ] = clientID;

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

@@ -42 +42 @@
   Welcome( unsigned int clientID, unsigned int shipID );
   Welcome( unsigned char* data, int clientID );
-  ~Welcome();
+  virtual ~Welcome();
   
   unsigned char *getData();