Borland C++ makefile for Darkplaces. Does NOT use asm objs yet, but works otherwise.

[xonotic/darkplaces.git] / net_wipx.c

diff --git a/net_wipx.c b/net_wipx.c
index 3d5ec4feb0d0900dd306da8ae13066348888a368..f4b37f3e37906f15a265af8c9c32cf5e04847ab2 100644 (file)
--- a/net_wipx.c
+++ b/net_wipx.c
@@ -50,7 +50,7 @@ int WIPX_Init (void)
        int             r;
        WORD    wVersionRequested; 
 
-       if (COM_CheckParm ("-noipx"))
+       if (!COM_CheckParm ("-ipx")) // LordHavoc: changed -noipx to -ipx at Dabb's request, apparently crashs on computers without MS clients installed
                return -1;
 
 // make sure LoadLibrary has happened successfully
@@ -239,11 +239,12 @@ int WIPX_Read (int handle, byte *buf, int len, struct qsockaddr *addr)
        int addrlen = sizeof (struct qsockaddr);
        int socket = ipxsocket[handle];
        int ret;
+       int errno;
 
        ret = precvfrom (socket, packetBuffer, len+4, 0, (struct sockaddr *)addr, &addrlen);
        if (ret == -1)
        {
-               int errno = pWSAGetLastError();
+               errno = pWSAGetLastError();
 
                if (errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED)
                        return 0;
@@ -350,13 +351,14 @@ int WIPX_StringToAddr (char *string, struct qsockaddr *addr)
 
 int WIPX_GetSocketAddr (int handle, struct qsockaddr *addr)
 {
+       int errno;
        int socket = ipxsocket[handle];
        int addrlen = sizeof(struct qsockaddr);
 
        memset(addr, 0, sizeof(struct qsockaddr));
        if(pgetsockname(socket, (struct sockaddr *)addr, &addrlen) != 0)
        {
-               int errno = pWSAGetLastError();
+               errno = pWSAGetLastError();
        }
 
        return 0;