Changeset 8327 for code/trunk/src/libraries/network/GamestateManager.h

Timestamp:

Apr 25, 2011, 8:22:36 PM (13 years ago)

Author:

scheusso

Message:

merging network6 into trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/network/GamestateManager.h (modified) (3 diffs)

code/trunk/src/libraries/network/GamestateManager.h

@@ -73 +73 @@
     {
       uint32_t  peerID;
-      uint32_t  lastProcessedGamestateID;
-      uint32_t  lastAckedGamestateID;
+      uint32_t  lastReceivedGamestateID;  //!< id of the last gamestate which was received (and processed) from the peer
+      uint32_t  lastAckedGamestateID;     //!< id of the last gamestate on which we received an ack from the peer
       bool      isSynched;
       std::map< uint32_t, packet::Gamestate* > gamestates;
@@ -86 +86 @@
     virtual bool      addGamestate(packet::Gamestate *gs, unsigned int peerID);
     virtual bool      ackGamestate(unsigned int gamestateID, unsigned int peerID);
-    virtual uint32_t  getLastProcessedGamestateID( unsigned int peerID );
+    virtual uint32_t  getLastReceivedGamestateID( unsigned int peerID );
     virtual uint32_t  getCurrentGamestateID(){ return currentGamestate_->getID(); }
     
@@ -101 +101 @@
       { assert(peerMap_.find(peerID)!=peerMap_.end()); peerMap_[peerID].isSynched = true; }
     void removePeer( uint32_t peerID );
+    bool hasPeers(){ return this->peerMap_.size()!=0; }
 //     void removeClient(ClientInformation *client);
   protected: