Reverted change to comms handling

Author: nickgammon

doc.cpp

@@ -1345,18 +1345,15 @@ CString str = strText;
 
 }
 
-void CMUSHclientDoc::ReceiveMsg(char * buff, int count)
+void CMUSHclientDoc::ReceiveMsg()
 {
+char buff [1000];   // must be less than COMPRESS_BUFFER_LENGTH or it won't fit
+int count = m_pSocket->Receive (buff, sizeof (buff) - 1);
 
   Frame.CheckTimerFallback ();   // see if time is up for timers to fire
 
   if (count == SOCKET_ERROR)
     {
-
-    DWORD errcode = GetLastError();
-    if (errcode == WSAEWOULDBLOCK || errcode == 0)
-      return;  // it's ok, nothing to do
-
     // don't delete the socket if we are already closing it
     if (m_iConnectPhase == eConnectDisconnecting)
        return;

doc.h

@@ -1406,7 +1406,7 @@ class CMUSHclientDoc : public CDocument
                const bool bEchoIt,
                const bool bQueueIt,
                const bool bLogIt);
-	void ReceiveMsg(char * buff, int count);
+	void ReceiveMsg();
 	void DisplayMsg(LPCTSTR lpszText, int size, const int flags);
   void AddToLine (LPCTSTR lpszText, const int flags);
   void StartNewLine_KeepPreviousStyle (const int flags);

worldsock.cpp

@@ -29,22 +29,7 @@ CWorldSocket::CWorldSocket(CMUSHclientDoc* pDoc)
 
 void CWorldSocket::OnReceive(int nErrorCode)
 {
-
-char buff [1000];   // must be less than COMPRESS_BUFFER_LENGTH or it won't fit
-
-  while (true)
-    {
-    int count = m_pDoc->m_pSocket->Receive (buff, sizeof (buff) - 1);
-	  m_pDoc->ReceiveMsg(buff, count);
-
-    if (count == 0)  // connection closed or nothing left
-      break;
-
-    if (count == SOCKET_ERROR)
-      break;         // some error or other
-
-    } // end of while
-
+  m_pDoc->ReceiveMsg();
   CAsyncSocket::OnReceive(nErrorCode);
 }