Changeset 1740 for code/trunk/src/network/packet

Timestamp:

Sep 8, 2008, 2:48:48 AM (16 years ago)

Author:

landauf

Message:

removed 3 warnings:

• Host.cc was twice in CMakeLists.txt
• virtual destructors for Host and GamestateHandler
• returning false instead of NULL in Gamestate.cc

File:

• code/trunk/src/network/packet/Gamestate.cc (modified) (13 diffs)

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

@@ -39 +39 @@
 
 namespace packet {
-  
+
 
 #define GAMESTATE_START(data) data + sizeof(GamestateHeader)
 #define GAMESTATE_HEADER(data) ((GamestateHeader *)data)
 #define HEADER GAMESTATE_HEADER(data_)
-  
+
 Gamestate::Gamestate()
 {
@@ -64 +64 @@
   assert(data_==0 /*&& bs_==0*/);
   int size = calcGamestateSize(mode);
-  
+
   COUT(4) << "G.ST.Man: producing gamestate with id: " << id << std::endl;
     //retval->data = (unsigned char*)malloc(size);
@@ -82 +82 @@
   for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it){
     tempsize=it->getSize2(mode);
-    
+
     if(currentsize+tempsize > size){
       // start allocate additional memory
@@ -101 +101 @@
     currentsize+=tempsize;
   }
-  
-  
+
+
   //start write gamestate header
   HEADER->packetType = ENUM::Gamestate;
-  assert( *(ENUM::Type *)(data_) == ENUM::Gamestate); 
+  assert( *(ENUM::Type *)(data_) == ENUM::Gamestate);
   HEADER->normsize = currentsize;
   HEADER->id = id;
@@ -112 +112 @@
   HEADER->compressed = false;
   //stop write gamestate header
-  
+
   COUT(5) << "G.ST.Man: Gamestate size: " << currentsize << std::endl;
   COUT(5) << "G.ST.Man: 'estimated' (and corrected) Gamestate size: " << size << std::endl;
@@ -125 +125 @@
     // get the start of the Synchronisable list
   orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::start();
-  
+
   while(mem < data_+sizeof(GamestateHeader)+HEADER->normsize){
       // extract synchronisable header
@@ -144 +144 @@
         it=orxonox::ObjectList<Synchronisable>::end();
       }
-    } else 
+    } else
     {
         // we have our object
@@ -185 +185 @@
   if(buffer==0)
     return false;
-  
+
   unsigned char *ndata = new unsigned char[buffer+sizeof(GamestateHeader)];
   unsigned char *dest = GAMESTATE_START(ndata);
@@ -192 +192 @@
   switch ( retval ) {
     case Z_OK: COUT(5) << "G.St.Man: compress: successfully compressed" << std::endl; break;
-    case Z_MEM_ERROR: COUT(1) << "G.St.Man: compress: not enough memory available in gamestate.compress" << std::endl; 
+    case Z_MEM_ERROR: COUT(1) << "G.St.Man: compress: not enough memory available in gamestate.compress" << std::endl;
     return false;
     case Z_BUF_ERROR: COUT(2) << "G.St.Man: compress: not enough memory available in the buffer in gamestate.compress" << std::endl;
@@ -224 +224 @@
     bufsize = normsize;
   if(bufsize==0)
-    return NULL;
+    return false;
   unsigned char *ndata = new unsigned char[bufsize + sizeof(GamestateHeader)];
   unsigned char *dest = ndata + sizeof(GamestateHeader);
@@ -236 +236 @@
     case Z_DATA_ERROR: COUT(2) << "data corrupted (zlib)" << std::endl; return false;
   }
-  
+
   HEADER->compressed = false;
   //copy over the header
@@ -245 +245 @@
   data_ = ndata;
   //bs_ = new Bytestream(getGs(), GAMESTATE_HEADER->normsize);
-  
+
   return true;
 }
@@ -340 +340 @@
     return HEADER->diffed;
   }
-  
+
   int Gamestate::getBaseID(){
     return HEADER->base_id;