Changeset 620 for code/branches/FICN/src/network/PacketGenerator.cc

Timestamp:

Dec 18, 2007, 5:51:47 PM (16 years ago)

Author:

scheusso

Message:

gamestatehandling, error correction

File:

• code/branches/FICN/src/network/PacketGenerator.cc (modified) (1 diff)

code/branches/FICN/src/network/PacketGenerator.cc

@@ -98 +98 @@
 ENetPacket* PacketGenerator::gstate( GameStateCompressed* states, int reliable )
 {
-        int* gid = new int;
-        *gid = GAMESTATE; //first assign the correct enet id
+        int gid = GAMESTATE; //first assign the correct enet id
         int totalLen = 4*sizeof( int ) + sizeof(bool) + states->compsize; //calculate the total size of the datastream memory
-        unsigned char* data = (unsigned char*)malloc( totalLen ); //allocate the memory for datastream
-        memcpy( (void*)(data), (const void*)gid, sizeof( int ) ); //this is the enet id
-        memcpy( (void*)(data+sizeof(int)), (const void*)&(states->id), sizeof(int) ); //the GameStateCompressed id
-        //this is the compressed size of the GameStateCompressed data, place at 3th position of the enet datastream
-        memcpy( (void*)(data+2*sizeof(int)), (const void*)&(states->compsize), sizeof(int));
+        unsigned char *data = (unsigned char*)malloc( totalLen ); //allocate the memory for datastream
+  memcpy( (void*)(data), (const void*)&gid, sizeof( int ) ); //this is the enet id
+  memcpy( (void*)(data+sizeof(int)), (const void*)&(states->id), sizeof(int) ); //the GameStateCompressed id
+  memcpy( (void*)(data+2*sizeof(int)), (const void*)&(states->compsize), sizeof(int));
+  memcpy( (void*)(data+3*sizeof(int)), (const void*)&(states->normsize), sizeof(int));
+  memcpy( (void*)(data+4*sizeof(int)), (const void*)&(states->diffed), sizeof(bool));
+  /*(int)*(data) = gid;
+        (int)*(data+sizeof(int)) = states->id;
+  //this is the compressed size of the GameStateCompressed data, place at 3th position of the enet datastream
+  (int)*(data+2*sizeof(int)) = states->compsize;
         //this is the uncompressed size of GameStateCompressed data
-        memcpy( (void*)(data+3*sizeof(int)), (const void*)&(states->normsize), sizeof(int));
+  (int)*(data+3*sizeof(int)) = states->normsize;
         //since there is a new parameter inside GameStateCompressed, change this function to create packet
-        memcpy( (void*)(data+4*sizeof(int)), (const void*)states->diffed, sizeof(bool));
+  (bool)*(data+4*sizeof(int)) = states->diffed;*/
         //place the GameStateCompressed data at the end of the enet datastream
         memcpy( (void*)(data+4*sizeof( int ) + sizeof(bool)), (const void*)states->data, states->compsize );
         //create an enet packet with the generated bytestream
         ENetPacket *packet = enet_packet_create( data , totalLen, reliable );
-
+  //delete data;
         return packet;
 }