[Gcblue-commits] gcb_wx/src/network tcConnectionData.cpp,1.6,1.7 tcMessage.cpp,1.4,1.5 tcMultiplayerInterface.cpp,1.15,1.16 tcNetworkInterface.cpp,1.11,1.12

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

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

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


Index: tcMessage.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcMessage.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcMessage.cpp	4 Apr 2004 21:00:43 -0000	1.4
--- tcMessage.cpp	14 May 2004 23:37:08 -0000	1.5
***************
*** 89,93 ****
      }
      bufferIdx = 0;    
!     timestamp = tcTime::Get30HzCount();
  
      data.header.messageSize = messageSize + HEADER_SIZE;
--- 89,93 ----
      }
      bufferIdx = 0;    
!     timestamp = tcTime::Get()->Get30HzCount();
  
      data.header.messageSize = messageSize + HEADER_SIZE;
***************
*** 117,121 ****
  void tcMessage::StampTime()
  {
!     timestamp = tcTime::Get30HzCount();
  }
  
--- 117,121 ----
  void tcMessage::StampTime()
  {
!     timestamp = tcTime::Get()->Get30HzCount();
  }
  

Index: tcConnectionData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcConnectionData.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcConnectionData.cpp	2 May 2004 16:22:45 -0000	1.6
--- tcConnectionData.cpp	14 May 2004 23:37:08 -0000	1.7
***************
*** 250,254 ****
      {
          //fprintf(stdout,"Sent message, size:%d, id:%d, t:%d\n",
!         //    message->GetMessageSize(), message->GetMessageId(), tcTime::Get30HzCount());
          writeCount += message->GetMessageSize();
          writeQueueTCP.pop();
--- 250,254 ----
      {
          //fprintf(stdout,"Sent message, size:%d, id:%d, t:%d\n",
!         //    message->GetMessageSize(), message->GetMessageId(), tcTime::Get()->Get30HzCount());
          writeCount += message->GetMessageSize();
          writeQueueTCP.pop();
***************
*** 258,262 ****
      {
          fprintf(stdout,"Sent partial message, buff_idx:%d, id:%d, t:%d\n",
!             message->bufferIdx, message->GetMessageId(), tcTime::Get30HzCount());
      }
  
--- 258,262 ----
      {
          fprintf(stdout,"Sent partial message, buff_idx:%d, id:%d, t:%d\n",
!             message->bufferIdx, message->GetMessageId(), tcTime::Get()->Get30HzCount());
      }
  
***************
*** 303,307 ****
      writeCount += message->GetMessageSize();
      //fprintf(stdout,"Sent UDP packet to %s, size:%d, id:%d, t:%d\n",
!     //    peerName.c_str(), message->GetMessageSize(), message->GetMessageId(), tcTime::Get30HzCount());
  
      writeQueueUDP.pop();
--- 303,307 ----
      writeCount += message->GetMessageSize();
      //fprintf(stdout,"Sent UDP packet to %s, size:%d, id:%d, t:%d\n",
!     //    peerName.c_str(), message->GetMessageSize(), message->GetMessageId(), tcTime::Get()->Get30HzCount());
  
      writeQueueUDP.pop();

Index: tcMultiplayerInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcMultiplayerInterface.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcMultiplayerInterface.cpp	9 May 2004 20:40:22 -0000	1.15
--- tcMultiplayerInterface.cpp	14 May 2004 23:37:08 -0000	1.16
***************
*** 902,906 ****
  {
      static unsigned lastUpdate = 0;
!     unsigned currentTime = tcTime::Get30HzCount();
      if (currentTime - lastUpdate < 5) return;
      
--- 902,906 ----
  {
      static unsigned lastUpdate = 0;
!     unsigned currentTime = tcTime::Get()->Get30HzCount();
      if (currentTime - lastUpdate < 5) return;
      
***************
*** 915,919 ****
          {
              tcPlayerStatus stat;
!             stat.timestamp = tcTime::Get30HzCount();
              stat.name = "anonymous";
              playerInfo[connId] = stat;
--- 915,919 ----
          {
              tcPlayerStatus stat;
!             stat.timestamp = tcTime::Get()->Get30HzCount();
              stat.name = "anonymous";
              playerInfo[connId] = stat;
***************
*** 922,926 ****
          else
          {
!             playerInfo[connId].timestamp = tcTime::Get30HzCount();
          }
      }
--- 922,926 ----
          else
          {
!             playerInfo[connId].timestamp = tcTime::Get()->Get30HzCount();
          }
      }
***************
*** 1022,1026 ****
  {
      static unsigned lastUpdate = 0;
!     unsigned currentTime = tcTime::Get30HzCount();
      if (currentTime - lastUpdate < 240) return;
      
--- 1022,1026 ----
  {
      static unsigned lastUpdate = 0;
!     unsigned currentTime = tcTime::Get()->Get30HzCount();
      if (currentTime - lastUpdate < 240) return;
      

Index: tcNetworkInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcNetworkInterface.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcNetworkInterface.cpp	2 May 2004 16:22:45 -0000	1.11
--- tcNetworkInterface.cpp	14 May 2004 23:37:08 -0000	1.12
***************
*** 55,59 ****
      }
  
!     cdata.timestamp = tcTime::Get30HzCount();
      cdata.id = connectionIndex++;
  
--- 55,59 ----
      }
  
!     cdata.timestamp = tcTime::Get()->Get30HzCount();
      cdata.id = connectionIndex++;
  
***************
*** 154,160 ****
  std::string tcNetworkInterface::GetConnectionStatus(unsigned connectionIdx)
  {
      if (connectState == IS_CONNECTING)
      {
!         wxString status = wxString::Format("Connecting to %s", hostAddress.Hostname().c_str());
          return status.c_str();
      }
--- 154,169 ----
  std::string tcNetworkInterface::GetConnectionStatus(unsigned connectionIdx)
  {
+     unsigned timeCount = tcTime::Get()->Get30HzCount();
+ 
      if (connectState == IS_CONNECTING)
      {
!         wxString status = wxString::Format("Connecting to %s ", hostAddress.IPAddress().c_str());
! 
!         // display "animated" dots while connecting to indicate something is happening
!         unsigned animateCount = timeCount % 40;
!         if (animateCount >= 10) status += ". ";
!         if (animateCount >= 20) status += ". ";
!         if (animateCount >= 30) status += ".";
! 
          return status.c_str();
      }
***************
*** 163,168 ****
      tcConnectionData& connData = connectionData[connectionIdx];
  
!     float dt_sec = (1.0f/30.0f)*
!         (float)(tcTime::Get30HzCount() - connData.timestamp);
      unsigned long bytesIn = connData.GetReadCount();
      unsigned long bytesOut = connData.GetWriteCount();
--- 172,176 ----
      tcConnectionData& connData = connectionData[connectionIdx];
  
!     float dt_sec = (1.0f/30.0f)*(float)(timeCount - connData.timestamp);
      unsigned long bytesIn = connData.GetReadCount();
      unsigned long bytesOut = connData.GetWriteCount();
***************
*** 447,451 ****
  
      connectState = IS_CONNECTING;
!     connectionStartTime = tcTime::Get30HzCount();
  
  
--- 455,459 ----
  
      connectState = IS_CONNECTING;
!     connectionStartTime = tcTime::Get()->Get30HzCount();
  
  
***************
*** 647,654 ****
  {
      /*
!     static unsigned lastUpdate = tcTime::Get30HzCount();
  
!     if ((tcTime::Get30HzCount() - lastUpdate) < 15) return;
!     lastUpdate = tcTime::Get30HzCount();
      */
      if (isServer)
--- 655,662 ----
  {
      /*
!     static unsigned lastUpdate = tcTime::Get()->Get30HzCount();
  
!     if ((tcTime::Get()->Get30HzCount() - lastUpdate) < 15) return;
!     lastUpdate = tcTime::Get()->Get30HzCount();
      */
      if (isServer)
***************
*** 683,687 ****
  {
      wxASSERT (connectState == IS_CONNECTING);
!     bool timedOut = tcTime::Get30HzCount() - connectionStartTime > 30*5;
      if (timedOut)
      {
--- 691,695 ----
  {
      wxASSERT (connectState == IS_CONNECTING);
!     bool timedOut = tcTime::Get()->GetUpdated30HzCount() - connectionStartTime > 30*5;
      if (timedOut)
      {