colors for DrawQ_Mesh are now float rather than byte, and vertices are padded to...

[xonotic/darkplaces.git] / net_wins.c

diff --git a/net_wins.c b/net_wins.c
index 240b9187d70bc66f500a58ea3f4a834bbe1db42f..4deb5c7cc6cf7cfb702ac51556271cbf6e7c9fd9 100644 (file)
--- a/net_wins.c
+++ b/net_wins.c
@@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "winquake.h"
 
-extern cvar_t hostname;
-
 #define MAXHOSTNAMELEN         256
 
 static int net_acceptsocket = -1;              // socket for fielding new connections
@@ -68,10 +66,10 @@ BOOL PASCAL FAR BlockingHook(void)
     MSG                msg;
     BOOL       ret;
  
-       if ((Sys_FloatTime() - blocktime) > 2.0)
+       if ((Sys_DoubleTime() - blocktime) > 2.0)
        {
                WSACancelBlockingCall();
-               return FALSE;
+               return false;
        }
 
     /* get the next message, if any */ 
@@ -83,12 +81,12 @@ BOOL PASCAL FAR BlockingHook(void)
         DispatchMessage(&msg); 
     } 
  
-    /* TRUE if we got a message */ 
+    /* true if we got a message */ 
     return ret; 
 } 
 
 
-void WINS_GetLocalAddress()
+void WINS_GetLocalAddress(void)
 {
        struct hostent  *local = NULL;
        char                    buff[MAXHOSTNAMELEN];
@@ -100,7 +98,7 @@ void WINS_GetLocalAddress()
        if (pgethostname(buff, MAXHOSTNAMELEN) == SOCKET_ERROR)
                return;
 
-       blocktime = Sys_FloatTime();
+       blocktime = Sys_DoubleTime();
        WSASetBlockingHook(BlockingHook);
        local = pgethostbyname(buff);
        WSAUnhookBlockingHook();
@@ -110,7 +108,7 @@ void WINS_GetLocalAddress()
        myAddr = *(int *)local->h_addr_list[0];
 
        addr = ntohl(myAddr);
-       sprintf(my_tcpip_address, "%d.%d.%d.%d", (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
+       sprintf(my_tcpip_address, "%d.%d.%d.%d", (int) ((addr >> 24) & 0xff), (int) ((addr >> 16) & 0xff), (int) ((addr >> 8) & 0xff), (int) (addr & 0xff));
 }
 
 
@@ -129,7 +127,7 @@ int WINS_Init (void)
        
        if (hInst == NULL)
        {
-               Con_SafePrintf ("Failed to load winsock.dll\n");
+               Con_SafePrintf ("Failed to load wsock32.dll\n");
                winsock_lib_initialized = false;
                return -1;
        }
@@ -156,7 +154,7 @@ int WINS_Init (void)
                !pgethostname || !pgethostbyname || !pgethostbyaddr ||
                !pgetsockname)
        {
-               Con_SafePrintf ("Couldn't GetProcAddress from winsock.dll\n");
+               Con_SafePrintf ("Couldn't GetProcAddress from wsock32.dll\n");
                return -1;
        }
 
@@ -385,7 +383,7 @@ int WINS_CheckNewConnections (void)
        if (net_acceptsocket == -1)
                return -1;
 
-       if (precvfrom (net_acceptsocket, buf, sizeof(buf), MSG_PEEK, NULL, NULL) > 0)
+       if (precvfrom (net_acceptsocket, buf, sizeof(buf), MSG_PEEK, NULL, NULL) >= 0)
        {
                return net_acceptsocket;
        }
@@ -394,15 +392,16 @@ int WINS_CheckNewConnections (void)
 
 //=============================================================================
 
-int WINS_Read (int socket, byte *buf, int len, struct qsockaddr *addr)
+int WINS_Read (int socket, qbyte *buf, int len, struct qsockaddr *addr)
 {
        int addrlen = sizeof (struct qsockaddr);
        int ret;
+       int errno;
 
        ret = precvfrom (socket, buf, len, 0, (struct sockaddr *)addr, &addrlen);
        if (ret == -1)
        {
-               int errno = pWSAGetLastError();
+                errno = pWSAGetLastError();
 
                if (errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED)
                        return 0;
@@ -427,7 +426,7 @@ int WINS_MakeSocketBroadcastCapable (int socket)
 
 //=============================================================================
 
-int WINS_Broadcast (int socket, byte *buf, int len)
+int WINS_Broadcast (int socket, qbyte *buf, int len)
 {
        int ret;
 
@@ -449,7 +448,7 @@ int WINS_Broadcast (int socket, byte *buf, int len)
 
 //=============================================================================
 
-int WINS_Write (int socket, byte *buf, int len, struct qsockaddr *addr)
+int WINS_Write (int socket, qbyte *buf, int len, struct qsockaddr *addr)
 {
        int ret;
 
@@ -572,4 +571,3 @@ int WINS_SetSocketPort (struct qsockaddr *addr, int port)
        return 0;
 }
 
-//=============================================================================