[Gcblue-commits] gcb_wx/include/network tcMultiplayerInterface.h, 1.32, 1.33

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/network
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22513/include/network

Modified Files:
	tcMultiplayerInterface.h 
Log Message:


Index: tcMultiplayerInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcMultiplayerInterface.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** tcMultiplayerInterface.h	1 Dec 2006 03:39:53 -0000	1.32
--- tcMultiplayerInterface.h	6 Dec 2006 01:20:42 -0000	1.33
***************
*** 59,62 ****
--- 59,68 ----
  {
  public:
+     struct UpdateInfo
+     {
+         unsigned int updateTime;
+         unsigned int detailedUpdateTime;
+     };
+ 
      std::string name; ///< username of player
  	std::string nameWithRank; ///< name with rank title
***************
*** 70,74 ****
  	unsigned int sensorUpdateTime; ///< time of last sensor update (30 Hz tics)
      float ping_s; ///< value of last ping
!     std::map<long, unsigned int> lastUpdate; ///< map of (obj id, update time (30Hz tics))
  	tcAccountDatabase::UserData data; ///< local copy of account database entry (messy, merge or otherwise fix this)
      int connectionId;
--- 76,80 ----
  	unsigned int sensorUpdateTime; ///< time of last sensor update (30 Hz tics)
      float ping_s; ///< value of last ping
!     std::map<long, UpdateInfo> lastUpdate; ///< map of (obj id, update time (30Hz tics))
  	tcAccountDatabase::UserData data; ///< local copy of account database entry (messy, merge or otherwise fix this)
      int connectionId;
***************
*** 77,81 ****
  	unsigned char GetAlliance() const;
  	int GetConnectionId() const;
!     bool GetLastUpdate(long id, unsigned int& updateTime);
  	const std::string& GetName() const;
  	const std::string& GetNameWithRank() const;
--- 83,87 ----
  	unsigned char GetAlliance() const;
  	int GetConnectionId() const;
!     bool GetLastUpdate(long id, unsigned int& updateTime, unsigned int& detailedUpdateTime);
  	const std::string& GetName() const;
  	const std::string& GetNameWithRank() const;
***************
*** 89,92 ****
--- 95,99 ----
  	void SetRank(unsigned char val);
      void SetUpdate(long id, unsigned int updateTime);
+     void SetDetailedUpdate(long id, unsigned int detailedUpdateTime);
  };
  
***************
*** 197,201 ****
      void ClearMessageMap();
      void DistributeChatText();
!     unsigned int GetUpdatePeriod(const tcGameObject* obj, const std::string& playerName) const;
      bool IsNewPlayer(int id);
  
--- 204,209 ----
      void ClearMessageMap();
      void DistributeChatText();
!     void GetUpdatePeriod(const tcGameObject* obj, const std::string& playerName,
!         unsigned int& updatePeriod, unsigned int& detailedUpdatePeriod) const;
      bool IsNewPlayer(int id);
  
***************
*** 204,207 ****
--- 212,216 ----
  	void ProcessGMAddAccount(const wxString& args, wxString& msg);
  	void ProcessGMCreate(const wxString& args, wxString& msg);
+ 	void ProcessGMKick(const wxString& args, wxString& msg);
  	void ProcessGMMove(const wxString& args, wxString& msg);
      void ProcessMessage(int messageId, int connectionId,