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

Timestamp:

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

Author:

scheusso

Message:

gamestatehandling, error correction

File:

• code/branches/FICN/src/network/PacketDecoder.cc (modified) (5 diffs)

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

@@ -88 +88 @@
         *a = *(ack*)packet->data; //press pattern of ack on new data
 
-        //clean memory
-        enet_packet_destroy( packet );
-
-        printAck( a ); //debug info
+
+  processAck( a, clientId ); //debug info
+  
+  //clean memory
+  enet_packet_destroy( packet );
 }
 
@@ -143 +144 @@
         unsigned char* data = (unsigned char*)packet->data;
         //copy the GameStateCompressed id into the struct, which is located at second place data+sizeof( int )
-        memcpy( (void*)&(currentState->id), (const void*)(data+sizeof( int )), sizeof( int ) );
+  //memcpy( (void*)&(currentState->id), (const void*)(data+sizeof( int )), sizeof( int ) );
+  currentState->id = (int)*(data+sizeof(int));
         //copy the size of the GameStateCompressed compressed data into the new GameStateCompressed struct, located at 3th
         //position of the data stream, data+2*sizeof( int )
-        memcpy( (void*)&(currentState->compsize), (const void*)(data+2*sizeof( int )), sizeof( int) );
+//      memcpy( (void*)&(currentState->compsize), (const void*)(data+2*sizeof( int )), sizeof( int) );
+  currentState->compsize = (int)*(data+2*sizeof(int));
         //size of uncompressed data
-        memcpy( (void*)&(currentState->normsize), (const void*)(data+3*sizeof( int )), sizeof( int ) );
+//      memcpy( (void*)&(currentState->normsize), (const void*)(data+3*sizeof( int )), sizeof( int ) );
+  currentState->normsize = (int)*(data+3*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));
+//      memcpy( (void*)&(currentState->diffed), (const void*)(data+4*sizeof(int)), sizeof(bool));
+  currentState->diffed = (bool)*(data+4*sizeof(int));
         //since data is not allocated, because it's just a pointer, allocate it with size of gamestatedatastream
         currentState->data = (unsigned char*)(malloc( currentState->compsize ));
+  if(currentState->data==NULL)
+    std::cout << "memory leak" << std::endl;
         //copy the GameStateCompressed data
+  //std::cout << "packet size (enet): " << packet->dataLength << std::endl;
+  //std::cout << "totallen: " << 4*sizeof(int)+sizeof(bool)+currentState->compsize << std::endl;
         memcpy( (void*)(currentState->data), (const void*)(data+4*sizeof( int ) + sizeof(bool)), currentState->compsize );
 
@@ -160 +169 @@
   //run processGameStateCompressed
   //TODO: not yet implemented!
-  //processGamestate(currentState);
+  processGamestate(currentState);
 }
 
@@ -181 +190 @@
 }
 
+void PacketDecoder::processGamestate( GameStateCompressed *state ){
+  
+}
+
 void PacketDecoder::processClassid( classid *cid){
   printClassid(cid);
@@ -186 +199 @@
 }
 
+void PacketDecoder::processAck( ack *data, int clientID){
+  printAck(data);
+  return;
+}