actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed some bugs.

Browse Source
This commit is contained in:
Charles Lohr
2004-07-01 18:41:04 +00:00
parent 30aeffc63a
commit 8c1012533c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NetworkSyncManager.cpp
+7 -3
View File
@@ -110,10 +110,13 @@ void NetworkSyncManager::PostStartUp(CString ServerIP)
NetPlayerClient->SendPack((char*)m_packet.Data,m_packet.Position); NetPlayerClient->SendPack((char*)m_packet.Data,m_packet.Position);
ClearPacket(m_packet);
NetPlayerClient->ReadPack((char*)m_packet.Data,NETMAXBUFFERSIZE); NetPlayerClient->ReadPack((char*)m_packet.Data,NETMAXBUFFERSIZE);
int command = Read1(m_packet);
m_ServerVersion = 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()); LOG->Info("Server Version: %d %s", m_ServerVersion, m_ServerName.c_str());
} }
@@ -272,7 +275,7 @@ void NetworkSyncManager::DisplayStartupStatus()
//Networking wasn't attepmpted //Networking wasn't attepmpted
return; return;
case 1: case 1:
sMessage = "Connect to server successful."; sMessage = "Connection to " + m_ServerName + " sucessful.";
break; break;
case 2: case 2:
sMessage = "Connection failed."; sMessage = "Connection failed.";
@@ -322,7 +325,7 @@ CString NetworkSyncManager::ReadNT(NetPacket &Packet)
int Orig=Packet.Position; int Orig=Packet.Position;
CString TempStr; CString TempStr;
while ((Packet.Position<NETMAXBUFFERSIZE)&& (((char*)Packet.Data)[Packet.Position]!=0)) 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++; Packet.Position++;
return TempStr; return TempStr;
@@ -362,6 +365,7 @@ void NetworkSyncManager::WriteNT(NetPacket &Packet, CString Data)
while ((Packet.Position<NETMAXBUFFERSIZE)&&(index<Data.GetLength())) while ((Packet.Position<NETMAXBUFFERSIZE)&&(index<Data.GetLength()))
Packet.Data[Packet.Position++] = (unsigned char)(Data.c_str()[index++]); Packet.Data[Packet.Position++] = (unsigned char)(Data.c_str()[index++]);
//Is it proper to do "(unsigned char)(Data.c_str()[index++])"? //Is it proper to do "(unsigned char)(Data.c_str()[index++])"?
Packet.Data[Packet.Position++] = 0;
} }
stepmania/src/ezsockets.cpp
+3 -1
View File
@@ -399,8 +399,10 @@ int EzSockets::pUpdateRead()
int EzSockets::pUpdateWrite() int EzSockets::pUpdateWrite()
{ {
int bytes = pWriteData(outBuffer.c_str(),outBuffer.length()); int bytes = pWriteData(outBuffer.c_str(),outBuffer.length());
if (bytes>0)
outBuffer = outBuffer.substr(bytes); outBuffer = outBuffer.substr(bytes);
if (bytes<0)
state = skERROR;
return bytes; return bytes;
} }