X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=net_wipx.c;h=7bed13c71152e87a2bdab635da02915df85c52ef;hp=4eb3b9112013e521dce3c5da218142bfa265ec57;hb=a79a57664e9b2420bb4b5a06cde2e84b7191e967;hpb=85c8ba9ec06127c46afc95ac0101bd154bd90fb0

diff --git a/net_wipx.c b/net_wipx.c
index 4eb3b911..7bed13c7 100644
--- a/net_wipx.c
+++ b/net_wipx.c
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <wsipx.h>
 #include "net_wipx.h"
 
-extern cvar_t hostname;
-
 #define MAXHOSTNAMELEN		256
 
 static int net_acceptsocket = -1;		// socket for fielding new connections
@@ -50,7 +48,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
@@ -232,9 +230,23 @@ int WIPX_CheckNewConnections (void)
 
 //=============================================================================
 
-static byte packetBuffer[NET_DATAGRAMSIZE + 4];
+int WIPX_Recv (qbyte *buf, int len, struct qsockaddr *addr)
+{
+	return WIPX_Read (net_acceptsocket, buf, len, addr);
+}
+
+//=============================================================================
+
+int WIPX_Send (qbyte *buf, int len, struct qsockaddr *addr)
+{
+	return WIPX_Write (net_acceptsocket, buf, len, addr);
+}
+
+//=============================================================================
+
+static qbyte packetBuffer[NET_DATAGRAMSIZE + 4];
 
-int WIPX_Read (int handle, byte *buf, int len, struct qsockaddr *addr)
+int WIPX_Read (int handle, qbyte *buf, int len, struct qsockaddr *addr)
 {
 	int addrlen = sizeof (struct qsockaddr);
 	int socket = ipxsocket[handle];
@@ -263,14 +275,14 @@ int WIPX_Read (int handle, byte *buf, int len, struct qsockaddr *addr)
 
 //=============================================================================
 
-int WIPX_Broadcast (int handle, byte *buf, int len)
+int WIPX_Broadcast (int handle, qbyte *buf, int len)
 {
 	return WIPX_Write (handle, buf, len, &broadcastaddr);
 }
 
 //=============================================================================
 
-int WIPX_Write (int handle, byte *buf, int len, struct qsockaddr *addr)
+int WIPX_Write (int handle, qbyte *buf, int len, struct qsockaddr *addr)
 {
 	int socket = ipxsocket[handle];
 	int ret;
@@ -291,7 +303,7 @@ int WIPX_Write (int handle, byte *buf, int len, struct qsockaddr *addr)
 
 //=============================================================================
 
-char *WIPX_AddrToString (struct qsockaddr *addr)
+char *WIPX_AddrToString (const struct qsockaddr *addr)
 {
 	static char buf[28];
 
@@ -313,7 +325,7 @@ char *WIPX_AddrToString (struct qsockaddr *addr)
 
 //=============================================================================
 
-int WIPX_StringToAddr (char *string, struct qsockaddr *addr)
+int WIPX_StringToAddr (const char *string, struct qsockaddr *addr)
 {
 	int  val;
 	char buf[3];
@@ -366,7 +378,7 @@ int WIPX_GetSocketAddr (int handle, struct qsockaddr *addr)
 
 //=============================================================================
 
-int WIPX_GetNameFromAddr (struct qsockaddr *addr, char *name)
+int WIPX_GetNameFromAddr (const struct qsockaddr *addr, char *name)
 {
 	strcpy(name, WIPX_AddrToString(addr));
 	return 0;
@@ -374,7 +386,7 @@ int WIPX_GetNameFromAddr (struct qsockaddr *addr, char *name)
 
 //=============================================================================
 
-int WIPX_GetAddrFromName(char *name, struct qsockaddr *addr)
+int WIPX_GetAddrFromName(const char *name, struct qsockaddr *addr)
 {
 	int n;
 	char buf[32];
@@ -399,7 +411,7 @@ int WIPX_GetAddrFromName(char *name, struct qsockaddr *addr)
 
 //=============================================================================
 
-int WIPX_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2)
+int WIPX_AddrCompare (const struct qsockaddr *addr1, const struct qsockaddr *addr2)
 {
 	if (addr1->sa_family != addr2->sa_family)
 		return -1;
@@ -430,4 +442,3 @@ int WIPX_SetSocketPort (struct qsockaddr *addr, int port)
 	return 0;
 }
 
-//=============================================================================