[Orxonox-commit 3722] r8402 - code/trunk/src/libraries/network

scheusso at orxonox.net scheusso at orxonox.net
Thu May 5 15:40:13 CEST 2011


Author: scheusso
Date: 2011-05-05 15:40:12 +0200 (Thu, 05 May 2011)
New Revision: 8402

Modified:
   code/trunk/src/libraries/network/GamestateManager.h
Log:
fix for Notification Script (bug is in network)



Modified: code/trunk/src/libraries/network/GamestateManager.h
===================================================================
--- code/trunk/src/libraries/network/GamestateManager.h	2011-05-05 13:27:39 UTC (rev 8401)
+++ code/trunk/src/libraries/network/GamestateManager.h	2011-05-05 13:40:12 UTC (rev 8402)
@@ -86,7 +86,7 @@
     virtual bool      addGamestate(packet::Gamestate *gs, unsigned int peerID);
     virtual bool      ackGamestate(unsigned int gamestateID, unsigned int peerID);
     virtual uint32_t  getLastReceivedGamestateID( unsigned int peerID );
-    virtual uint32_t  getCurrentGamestateID(){ return currentGamestate_->getID(); }
+    virtual uint32_t  getCurrentGamestateID(){ if( currentGamestate_) return currentGamestate_->getID(); else return GAMESTATEID_INITIAL; }
     
     bool processGamestates();
     bool sendAck(unsigned int gamestateID, uint32_t peerID);




More information about the Orxonox-commit mailing list