Changeset 7755 for code/branches/network4/src/libraries

Timestamp:

Dec 11, 2010, 4:12:21 PM (14 years ago)

Author:

scheusso

Message:

build fix

Location:

code/branches/network4/src/libraries/network

Files:

• GamestateManager.cc (modified) (1 diff)
• packet/Gamestate.cc (modified) (5 diffs)
• packet/Gamestate.h (modified) (1 diff)
• synchronisable/Synchronisable.cc (modified) (2 diffs)

code/branches/network4/src/libraries/network/GamestateManager.cc

@@ -219 +219 @@
     assert(b);
       clock.capture();
-      COUT(0) << "diff time: " << clock.getDeltaTime() << endl;
+      COUT(4) << "diff and compress time: " << clock.getDeltaTime() << endl;
 //     COUT(5) << "sending gamestate with id " << gs->getID();
 //     if(gamestate->isDiffed())

code/branches/network4/src/libraries/network/packet/Gamestate.cc

@@ -65 +65 @@
 
 Gamestate::Gamestate():
-  header_(0)
+  header_()
 {
   flags_ = flags_ | PACKET_FLAG_GAMESTATE;
@@ -176 +176 @@
   uint8_t *mem=data_+GamestateHeader::getSize();
   Synchronisable *s;
-
+  
   // update the data of the objects we received
   while(mem < data_+GamestateHeader::getSize()+header_.getDataSize())
@@ -191 +191 @@
       else
       {
+//         COUT(4) << "not creating object of classid " << objectheader.getClassID() << endl;
         mem += objectheader.getDataSize() + ( objectheader.isDiffed() ? SynchronisableHeaderLight::getSize() : SynchronisableHeader::getSize() );
       }
@@ -196 +197 @@
     else
     {
+//       COUT(4) << "updating object of classid " << objectheader.getClassID() << endl;
       bool b = s->updateData(mem, mode);
       assert(b);
@@ -303 +305 @@
   header_.setCompSize( buffer );
   header_.setCompressed( true );
-  COUT(0) << "gamestate compress datasize: " << header_.getDataSize() << " compsize: " << header_.getCompSize() << std::endl;
+  COUT(4) << "gamestate compress datasize: " << header_.getDataSize() << " compsize: " << header_.getCompSize() << std::endl;
   return true;
 }

code/branches/network4/src/libraries/network/packet/Gamestate.h

@@ -48 +48 @@
 class _NetworkExport GamestateHeader{
   public:
-    GamestateHeader();
+    GamestateHeader(){ data_=0; }
     GamestateHeader(uint8_t* data)
       { assert(data); data_ = data; *(uint32_t*)data_ = Type::Gamestate; }

code/branches/network4/src/libraries/network/synchronisable/Synchronisable.cc

@@ -222 +222 @@
    * length of varx: size saved int syncvarlist
    * @param mem pointer to allocated memory with enough size
-   * @param sizes FIXME - add doc!
+   * @param sizes vector containing sizes of all objects in gamestate (to be appended)
    * @param id gamestateid of the gamestate to be saved (important for priorities)
    * @param mode defines the direction in which the data will be send/received
    *             0x1: server->client
-   *             0x2: client->server (not recommended)
+   *             0x2: client->server
    *             0x3: bidirectional
    * @return true: if !doSync or if everything was successfully saved
@@ -270 +270 @@
       //tempsize += (*i)->getSize( mode );
     }
+    assert(tempsize!=0);  // if this happens an empty object (with no variables) would be transmitted
 //     COUT(4) << endl;