summaryrefslogtreecommitdiff
path: root/network_data.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-07-20 15:29:28 +0000
committertron <tron@openttd.org>2005-07-20 15:29:28 +0000
commitac66e3e28f35c6939d3af68d1f0e26eb9b34e377 (patch)
treea82679a91beaee405777f0f3c5e3c45814f1ea5d /network_data.c
parentf432314fa907d4f3ee63537d399bad64a35033bd (diff)
downloadopenttd-ac66e3e28f35c6939d3af68d1f0e26eb9b34e377.tar.xz
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
Diffstat (limited to 'network_data.c')
-rw-r--r--network_data.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/network_data.c b/network_data.c
index cbb0b6f04..18b179fd0 100644
--- a/network_data.c
+++ b/network_data.c
@@ -44,30 +44,30 @@ void NetworkSend_uint8(Packet *packet, uint8 data)
void NetworkSend_uint16(Packet *packet, uint16 data)
{
assert(packet->size < sizeof(packet->buffer) - sizeof(data));
- packet->buffer[packet->size++] = data & 0xFF;
- packet->buffer[packet->size++] = (data >> 8) & 0xFF;
+ packet->buffer[packet->size++] = GB(data, 0, 8);
+ packet->buffer[packet->size++] = GB(data, 8, 8);
}
void NetworkSend_uint32(Packet *packet, uint32 data)
{
assert(packet->size < sizeof(packet->buffer) - sizeof(data));
- packet->buffer[packet->size++] = data & 0xFF;
- packet->buffer[packet->size++] = (data >>= 8) & 0xFF;
- packet->buffer[packet->size++] = (data >>= 8) & 0xFF;
- packet->buffer[packet->size++] = (data >> 8) & 0xFF;
+ packet->buffer[packet->size++] = GB(data, 0, 8);
+ packet->buffer[packet->size++] = GB(data, 8, 8);
+ packet->buffer[packet->size++] = GB(data, 16, 8);
+ packet->buffer[packet->size++] = GB(data, 24, 8);
}
void NetworkSend_uint64(Packet *packet, uint64 data)
{
assert(packet->size < sizeof(packet->buffer) - sizeof(data));
- packet->buffer[packet->size++] = data & 0xFF;
- packet->buffer[packet->size++] = (data >>= 8) & 0xFF;
- packet->buffer[packet->size++] = (data >>= 8) & 0xFF;
- packet->buffer[packet->size++] = (data >>= 8) & 0xFF;
- packet->buffer[packet->size++] = (data >>= 8) & 0xFF;
- packet->buffer[packet->size++] = (data >>= 8) & 0xFF;
- packet->buffer[packet->size++] = (data >>= 8) & 0xFF;
- packet->buffer[packet->size++] = (data >> 8) & 0xFF;
+ packet->buffer[packet->size++] = GB(data, 0, 8);
+ packet->buffer[packet->size++] = GB(data, 8, 8);
+ packet->buffer[packet->size++] = GB(data, 16, 8);
+ packet->buffer[packet->size++] = GB(data, 24, 8);
+ packet->buffer[packet->size++] = GB(data, 32, 8);
+ packet->buffer[packet->size++] = GB(data, 40, 8);
+ packet->buffer[packet->size++] = GB(data, 48, 8);
+ packet->buffer[packet->size++] = GB(data, 56, 8);
}
// Sends a string over the network. It sends out