sparks and rain are now beam particles

[xonotic/darkplaces.git] / net_loop.c

diff --git a/net_loop.c b/net_loop.c
index ac2a5de9b2e050bb13a91af1a337814d8fba36b2..bfb356b5a648997d78ab3a81b1062a1edb04c404 100644 (file)
--- a/net_loop.c
+++ b/net_loop.c
@@ -153,8 +153,8 @@ int Loop_GetMessage (qsocket_t *sock)
 
 int Loop_SendMessage (qsocket_t *sock, sizebuf_t *data)
 {
-       byte *buffer;
-       int  *bufferLength;
+       qbyte *buffer;
+       int *bufferLength;
 
        if (!sock->driverdata)
                return -1;
@@ -162,7 +162,7 @@ int Loop_SendMessage (qsocket_t *sock, sizebuf_t *data)
        bufferLength = &((qsocket_t *)sock->driverdata)->receiveMessageLength;
 
        if ((*bufferLength + data->cursize + 4) > NET_MAXMESSAGE)
-               Sys_Error("Loop_SendMessage: overflow\n");
+               Host_Error("Loop_SendMessage: overflow\n");
 
        buffer = ((qsocket_t *)sock->driverdata)->receiveMessage + *bufferLength;
 
@@ -187,15 +187,16 @@ int Loop_SendMessage (qsocket_t *sock, sizebuf_t *data)
 
 int Loop_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data)
 {
-       byte *buffer;
-       int  *bufferLength;
+       qbyte *buffer;
+       int *bufferLength;
 
        if (!sock->driverdata)
                return -1;
 
        bufferLength = &((qsocket_t *)sock->driverdata)->receiveMessageLength;
 
-       if ((*bufferLength + data->cursize + sizeof(byte) + sizeof(short)) > NET_MAXMESSAGE)
+       // LordHavoc: added an extra sizeof(qbyte) to account for alignment
+       if ((*bufferLength + data->cursize + sizeof(qbyte) + sizeof(short) + sizeof(qbyte)) > NET_MAXMESSAGE)
                return 0;
 
        buffer = ((qsocket_t *)sock->driverdata)->receiveMessage + *bufferLength;
@@ -243,3 +244,4 @@ void Loop_Close (qsocket_t *sock)
        else
                loop_server = NULL;
 }
+