Changeset 437 for code/branches

Timestamp:

Dec 9, 2007, 1:46:03 PM (17 years ago)

Author:

dumenim

Message:

changed PacketGenerator/Decoder with diffed

Location:

code/branches/FICN/src/network

Files:

• PacketDecoder.cc (modified) (2 diffs)
• PacketGenerator.cc (modified) (3 diffs)
• PacketManager.h (modified) (1 diff)

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

@@ -44 +44 @@
                 return true;
                 break;
-          case CLASSID:
-                clid(packet);
-                return true;
-                break;
+    case CLASSID:
+        clid(packet);
+        return true;
+        break;
         }
         return false;
@@ -120 +120 @@
         //size of uncompressed data
         memcpy( (void*)&(currentState->normsize), (const void*)(data+3*sizeof( int )), sizeof( int ) );
+        //since the packetgenerator was changed, due to a new parameter, change this function too
+        memcpy( (void*)&(currentState->diffed), (const void*)(data+4*sizeof(int)), sizeof(bool));
         //since data is not allocated, because it's just a pointer, allocate it with size of gamestatedatastream
         currentState->data = (unsigned char*)(malloc( currentState->compsize ));
         //copy the GameStateCompressed data
-        memcpy( (void*)(currentState->data), (const void*)(data+4*sizeof( int )), currentState->compsize );
+        memcpy( (void*)(currentState->data), (const void*)(data+4*sizeof( int ) + sizeof(bool)), currentState->compsize );
   
         //clean memory

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

@@ -22 +22 @@
 ENetPacket* PacketGenerator::acknowledgement( int state, int reliable )
 {
-        std::cout << "generating new acknowledgement" << std::endl;
+    std::cout << "generating new acknowledgement" << std::endl;
         ack* ackreq = new ack;
         ackreq->id = ACK;
@@ -73 +73 @@
         int* gid = new int; 
         *gid = GAMESTATE; //first assign the correct enet id
-        int totalLen = 3*sizeof( int ) + states->compsize; //calculate the total size of the datastream memory
+        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
@@ -81 +81 @@
         //this is the uncompressed size of GameStateCompressed data
         memcpy( (void*)(data+3*sizeof(int)), (const void*)&(states->normsize), sizeof(int));
+        //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));
         //place the GameStateCompressed data at the end of the enet datastream
-        memcpy( (void*)(data+4*sizeof( int )), (const void*)states->data, states->compsize );
+        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 );

code/branches/FICN/src/network/PacketManager.h

@@ -27 +27 @@
         ENetPacket* mousem( double x, double y, int reliable = ENET_PACKET_FLAG_RELIABLE );
         ENetPacket* keystrike( char press, int reliable = ENET_PACKET_FLAG_RELIABLE );
-        ENetPacket* chatMessage( const char* message, int reliable = ENET_PACKET_FLAG_RELIABLE );
-        ENetPacket* gstate( GameStateCompressed *states, int reliable = ENET_PACKET_FLAG_RELIABLE );
-        ENetPacket* clid( int classid, std::string classname, int reliable = ENET_PACKET_FLAG_RELIABLE );
+    ENetPacket* chatMessage( const char* message, int reliable = ENET_PACKET_FLAG_RELIABLE );
+    ENetPacket* gstate( GameStateCompressed *states, int reliable = ENET_PACKET_FLAG_RELIABLE );
+    ENetPacket* clid( int classid, std::string classname, int reliable = ENET_PACKET_FLAG_RELIABLE );
 private:
 };