From d77e42115cfe1603dfeef24e35ddea838f8049c0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 7 Jul 2004 19:19:48 +0000 Subject: [PATCH] stop making wrong assumptions about the size of "short" and "int" --- stepmania/src/NetworkSyncManager.cpp | 12 ++++++------ stepmania/src/NetworkSyncManager.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index 7e32e61ce2..fa808dbc45 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -347,7 +347,7 @@ void NetworkSyncManager::ProcessInput() -unsigned char NetworkSyncManager::Read1(NetPacket &Packet) +uint8_t NetworkSyncManager::Read1(NetPacket &Packet) { if (Packet.Position>=NETMAXBUFFERSIZE) return 0; @@ -355,7 +355,7 @@ unsigned char NetworkSyncManager::Read1(NetPacket &Packet) return Packet.Data[Packet.Position++]; } -unsigned short int NetworkSyncManager::Read2(NetPacket &Packet) +uint16_t NetworkSyncManager::Read2(NetPacket &Packet) { if (Packet.Position>=NETMAXBUFFERSIZE-1) return 0; @@ -366,7 +366,7 @@ unsigned short int NetworkSyncManager::Read2(NetPacket &Packet) return ntohs(Temp); } -unsigned int NetworkSyncManager::Read4(NetPacket &Packet) +uint32_t NetworkSyncManager::Read4(NetPacket &Packet) { if (Packet.Position>=NETMAXBUFFERSIZE-3) 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) return; @@ -397,7 +397,7 @@ void NetworkSyncManager::Write1(NetPacket &Packet, unsigned char Data) Packet.Position++; } -void NetworkSyncManager::Write2(NetPacket &Packet, unsigned short int Data) +void NetworkSyncManager::Write2(NetPacket &Packet, uint16_t Data) { if (Packet.Position>=NETMAXBUFFERSIZE-1) return; @@ -406,7 +406,7 @@ void NetworkSyncManager::Write2(NetPacket &Packet, unsigned short int Data) Packet.Position+=2; } -void NetworkSyncManager::Write4(NetPacket &Packet, unsigned long Data) +void NetworkSyncManager::Write4(NetPacket &Packet, uint32_t Data) { if (Packet.Position>=NETMAXBUFFERSIZE-3) return ; diff --git a/stepmania/src/NetworkSyncManager.h b/stepmania/src/NetworkSyncManager.h index cb3dda0f8d..db23f99108 100644 --- a/stepmania/src/NetworkSyncManager.h +++ b/stepmania/src/NetworkSyncManager.h @@ -71,14 +71,14 @@ private: NetPacket m_packet; //Commands used to operate on NetPackets - unsigned char Read1(NetPacket &Packet); - unsigned short int Read2(NetPacket &Packet); - unsigned int Read4(NetPacket &Packet); + uint8_t Read1(NetPacket &Packet); + uint16_t Read2(NetPacket &Packet); + uint32_t Read4(NetPacket &Packet); CString ReadNT(NetPacket &Packet); - void Write1(NetPacket &Packet, unsigned char Data); - void Write2(NetPacket &Packet, unsigned short int Data); - void Write4(NetPacket &Packet, unsigned long Data); + void Write1(NetPacket &Packet, uint8_t Data); + void Write2(NetPacket &Packet, uint16_t Data); + void Write4(NetPacket &Packet, uint32_t Data); void WriteNT(NetPacket &Packet, CString Data); inline void ClearPacket(NetPacket &Packet) { memset((void*)(&Packet),0, sizeof(NetPacket)); }