Changeset 3102 for code/trunk

Timestamp:

May 28, 2009, 3:05:54 AM (16 years ago)

Author:

scheusso

Message:

fixed some problems when changing the gamestate (from menu to server i.e.)

Location:

code/trunk/src/network

Files:

• GamestateClient.cc (modified) (2 diffs)
• GamestateManager.cc (modified) (2 diffs)
• Server.cc (modified) (1 diff)
• synchronisable/SynchronisableVariable.h (modified) (1 diff)

code/trunk/src/network/GamestateClient.cc

@@ -111 +111 @@
   packet::Gamestate *GamestateClient::getGamestate(){
     packet::Gamestate *gs = new packet::Gamestate();
-    if(!gs->collectData(0)){
+    if(!gs->collectData(0,0x2)){
       delete gs;
       return 0;
@@ -172 +172 @@
       COUT(5) << "successfully undiffed gamestate id: " << undiffed->getID() << std::endl;
     }
-    if(gs->spreadData())
+    if(gs->spreadData(0x2))
       return gs;
     else

code/trunk/src/network/GamestateManager.cc

@@ -102 +102 @@
       delete reference;
     reference = new packet::Gamestate();
-    if(!reference->collectData(++id_)){ //we have no data to send
+    if(!reference->collectData(++id_, 0x1)){ //we have no data to send
       delete reference;
       reference=0;
@@ -200 +200 @@
     }
     assert(!gs->isDiffed());
-    return gs->spreadData();
+    return gs->spreadData(0x1);
   }
 

code/trunk/src/network/Server.cc

@@ -364 +364 @@
     packet::Gamestate *g = new packet::Gamestate();
     g->setClientID(temp->getID());
-    b = g->collectData(0);
+    b = g->collectData(0,0x1);
     if(!b)
       return false; //no data for the client

code/trunk/src/network/synchronisable/SynchronisableVariable.h

@@ -122 +122 @@
   template <class T> inline uint32_t SynchronisableVariable<T>::getData(uint8_t*& mem, uint8_t mode)
   {
-    if ( state_ == this->mode_ )
+    if ( mode == this->mode_ )
     {
       saveAndIncrease( this->variable_, mem );