[Gcblue-commits] gcb_wx/include/network tcConnectionData.h,1.1,1.2 tcMessage.h,1.1,1.2 tcMultiplayerInterface.h,1.1,1.2 tcNetworkInterface.h,1.4,1.5

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

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

Modified Files:
	tcConnectionData.h tcMessage.h tcMultiplayerInterface.h 
	tcNetworkInterface.h 
Log Message:


Index: tcConnectionData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcConnectionData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcConnectionData.h	29 Feb 2004 22:51:35 -0000	1.1
--- tcConnectionData.h	2 Mar 2004 02:52:14 -0000	1.2
***************
*** 55,59 ****
  
  
!     tcMessage* ReadNextMessage();
      void SendTCP(unsigned int idx);
      void Update(); ///< read and write data from socket
--- 55,59 ----
  
  
!     void ReadNextMessage();
      void SendTCP(unsigned int idx);
      void Update(); ///< read and write data from socket

Index: tcMessage.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcMessage.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcMessage.h	29 Feb 2004 22:51:35 -0000	1.1
--- tcMessage.h	2 Mar 2004 02:52:14 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
      tcMessage();
      tcMessage(const tcMessage& source);
+     const tcMessage& operator=(const tcMessage& rhs);
  };
  

Index: tcMultiplayerInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcMultiplayerInterface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcMultiplayerInterface.h	29 Feb 2004 22:51:35 -0000	1.1
--- tcMultiplayerInterface.h	2 Mar 2004 02:52:14 -0000	1.2
***************
*** 25,31 ****
  #pragma once
  
  /*
  #include <vector>
! #include <queue>
  #include <map>
  */
--- 25,32 ----
  #pragma once
  
+ #include <queue>
  /*
  #include <vector>
! 
  #include <map>
  */
***************
*** 51,69 ****
  {
  public:
      static tcMultiplayerInterface& Get();
  
      int GetConnectionId(unsigned connectionIdx);
      std::string GetConnectionStatus(unsigned connectionIdx);
  
      unsigned GetNumConnections();
      void MakeClient();
      void MakeServer();
      void OpenConnection(std::string hostName);
!     void SendTestMessage(int destination, std::string message);
      void Update(); 
  
  private:
      tcNetworkInterface *networkInterface;
  
      tcMultiplayerInterface();
      tcMultiplayerInterface(const tcMultiplayerInterface& source);
--- 52,82 ----
  {
  public:
+     enum
+     {
+         MSG_CHATTEXT = 1,
+     };
      static tcMultiplayerInterface& Get();
  
+     std::string GetChatText();
      int GetConnectionId(unsigned connectionIdx);
      std::string GetConnectionStatus(unsigned connectionIdx);
  
      unsigned GetNumConnections();
+     
+     bool IsChatTextAvail();
+ 
      void MakeClient();
      void MakeServer();
      void OpenConnection(std::string hostName);
!     void SendChatText(int destination, std::string message);
      void Update(); 
  
  private:
      tcNetworkInterface *networkInterface;
+     std::queue<std::string> chatText; ///< chat text to display
  
+     void ProcessMessage(int connectionId, int messageId, 
+                     unsigned messageSize, unsigned char *data);
+     void ProcessReceiveMessages();
      tcMultiplayerInterface();
      tcMultiplayerInterface(const tcMultiplayerInterface& source);

Index: tcNetworkInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcNetworkInterface.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcNetworkInterface.h	29 Feb 2004 22:51:35 -0000	1.4
--- tcNetworkInterface.h	2 Mar 2004 02:52:14 -0000	1.5
***************
*** 58,61 ****
--- 58,62 ----
      tcMessage* GetMessage(int id);
      unsigned GetNumConnections();
+     bool IsServer();
      void MakeClient();
      void MakeServer();