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

stop making wrong assumptions about the size of "short" and "int"

Browse Source
This commit is contained in:
Glenn Maynard
2004-07-07 19:19:48 +00:00
parent e7894a86c7
commit d77e42115c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NetworkSyncManager.cpp
+6 -6
View File
@@ -347,7 +347,7 @@ void NetworkSyncManager::ProcessInput()
unsigned char NetworkSyncManager::Read1(NetPacket &Packet) uint8_t NetworkSyncManager::Read1(NetPacket &Packet)
{ {
if (Packet.Position>=NETMAXBUFFERSIZE) if (Packet.Position>=NETMAXBUFFERSIZE)
return 0; return 0;
@@ -355,7 +355,7 @@ unsigned char NetworkSyncManager::Read1(NetPacket &Packet)
return Packet.Data[Packet.Position++]; return Packet.Data[Packet.Position++];
} }
unsigned short int NetworkSyncManager::Read2(NetPacket &Packet) uint16_t NetworkSyncManager::Read2(NetPacket &Packet)
{ {
if (Packet.Position>=NETMAXBUFFERSIZE-1) if (Packet.Position>=NETMAXBUFFERSIZE-1)
return 0; return 0;
@@ -366,7 +366,7 @@ unsigned short int NetworkSyncManager::Read2(NetPacket &Packet)
return ntohs(Temp); return ntohs(Temp);
} }
unsigned int NetworkSyncManager::Read4(NetPacket &Packet) uint32_t NetworkSyncManager::Read4(NetPacket &Packet)
{ {
if (Packet.Position>=NETMAXBUFFERSIZE-3) if (Packet.Position>=NETMAXBUFFERSIZE-3)
return 0; return 0;
@@ -389,7 +389,7 @@ CString NetworkSyncManager::ReadNT(NetPacket &Packet)
} }
void NetworkSyncManager::Write1(NetPacket &Packet, unsigned char Data) void NetworkSyncManager::Write1(NetPacket &Packet, uint8_t Data)
{ {
if (Packet.Position>=NETMAXBUFFERSIZE) if (Packet.Position>=NETMAXBUFFERSIZE)
return; return;
@@ -397,7 +397,7 @@ void NetworkSyncManager::Write1(NetPacket &Packet, unsigned char Data)
Packet.Position++; Packet.Position++;
} }
void NetworkSyncManager::Write2(NetPacket &Packet, unsigned short int Data) void NetworkSyncManager::Write2(NetPacket &Packet, uint16_t Data)
{ {
if (Packet.Position>=NETMAXBUFFERSIZE-1) if (Packet.Position>=NETMAXBUFFERSIZE-1)
return; return;
@@ -406,7 +406,7 @@ void NetworkSyncManager::Write2(NetPacket &Packet, unsigned short int Data)
Packet.Position+=2; Packet.Position+=2;
} }
void NetworkSyncManager::Write4(NetPacket &Packet, unsigned long Data) void NetworkSyncManager::Write4(NetPacket &Packet, uint32_t Data)
{ {
if (Packet.Position>=NETMAXBUFFERSIZE-3) if (Packet.Position>=NETMAXBUFFERSIZE-3)
return ; return ;
stepmania/src/NetworkSyncManager.h
+6 -6
View File
@@ -71,14 +71,14 @@ private:
NetPacket m_packet; NetPacket m_packet;
//Commands used to operate on NetPackets //Commands used to operate on NetPackets
unsigned char Read1(NetPacket &Packet); uint8_t Read1(NetPacket &Packet);
unsigned short int Read2(NetPacket &Packet); uint16_t Read2(NetPacket &Packet);
unsigned int Read4(NetPacket &Packet); uint32_t Read4(NetPacket &Packet);
CString ReadNT(NetPacket &Packet); CString ReadNT(NetPacket &Packet);
void Write1(NetPacket &Packet, unsigned char Data); void Write1(NetPacket &Packet, uint8_t Data);
void Write2(NetPacket &Packet, unsigned short int Data); void Write2(NetPacket &Packet, uint16_t Data);
void Write4(NetPacket &Packet, unsigned long Data); void Write4(NetPacket &Packet, uint32_t Data);
void WriteNT(NetPacket &Packet, CString Data); void WriteNT(NetPacket &Packet, CString Data);
inline void ClearPacket(NetPacket &Packet) { memset((void*)(&Packet),0, sizeof(NetPacket)); } inline void ClearPacket(NetPacket &Packet) { memset((void*)(&Packet),0, sizeof(NetPacket)); }