From 8c1012533cb77b4497cb82d338b4e84478979d21 Mon Sep 17 00:00:00 2001
From: Charles Lohr <cnlohr@users.sourceforge.net>
Date: Thu, 1 Jul 2004 18:41:04 +0000
Subject: [PATCH] Fixed some bugs.

---
 stepmania/src/NetworkSyncManager.cpp | 10 +++++++---
 stepmania/src/ezsockets.cpp          |  6 ++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp
index 144fea5943..552c4ebe82 100644
--- a/stepmania/src/NetworkSyncManager.cpp
+++ b/stepmania/src/NetworkSyncManager.cpp
@@ -110,10 +110,13 @@ void NetworkSyncManager::PostStartUp(CString ServerIP)
 	
 	NetPlayerClient->SendPack((char*)m_packet.Data,m_packet.Position);
 
+	ClearPacket(m_packet);
+
 	NetPlayerClient->ReadPack((char*)m_packet.Data,NETMAXBUFFERSIZE);
 
+	int command = Read1(m_packet);
 	m_ServerVersion = Read1(m_packet);
-	CString m_ServerName = ReadNT(m_packet);
+	m_ServerName = ReadNT(m_packet);
 
 	LOG->Info("Server Version: %d %s", m_ServerVersion, m_ServerName.c_str());
 }
@@ -272,7 +275,7 @@ void NetworkSyncManager::DisplayStartupStatus()
 		//Networking wasn't attepmpted
 		return;
 	case 1:
-		sMessage = "Connect to server successful.";
+		sMessage = "Connection to " + m_ServerName + " sucessful.";
 		break;
 	case 2:
 		sMessage = "Connection failed.";
@@ -322,7 +325,7 @@ CString NetworkSyncManager::ReadNT(NetPacket &Packet)
 	int Orig=Packet.Position;
 	CString TempStr;
 	while ((Packet.Position<NETMAXBUFFERSIZE)&& (((char*)Packet.Data)[Packet.Position]!=0))
-		TempStr+=(char)Packet.Data[Packet.Position++];
+		TempStr= TempStr + (char)Packet.Data[Packet.Position++];
 
 	Packet.Position++;
 	return TempStr;
@@ -362,6 +365,7 @@ void NetworkSyncManager::WriteNT(NetPacket &Packet, CString Data)
 	while ((Packet.Position<NETMAXBUFFERSIZE)&&(index<Data.GetLength()))
 		Packet.Data[Packet.Position++] = (unsigned char)(Data.c_str()[index++]);
 			//Is it proper to do "(unsigned char)(Data.c_str()[index++])"?
+	Packet.Data[Packet.Position++] = 0;
 }
 
 
diff --git a/stepmania/src/ezsockets.cpp b/stepmania/src/ezsockets.cpp
index 3a8ebd0688..06fdc71ae1 100644
--- a/stepmania/src/ezsockets.cpp
+++ b/stepmania/src/ezsockets.cpp
@@ -399,8 +399,10 @@ int EzSockets::pUpdateRead()
 int EzSockets::pUpdateWrite()
 {
 	int bytes = pWriteData(outBuffer.c_str(),outBuffer.length());
-	outBuffer = outBuffer.substr(bytes);
-		
+	if (bytes>0)
+		outBuffer = outBuffer.substr(bytes);
+	if (bytes<0)
+		state = skERROR;
 	return bytes;
 }