okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Merge win_net.c and unix_net.c

Browse source 
+ Move win32/win_net.c to qcommon/net_ip.c and make it portable
  + Remove unix_net.c, but incorporate its revision history into win_net.c
  + Remove all IPX support -- this remains compatible with existing mods
  + This change also inadvertently gets us SOCKS support on non-Windows
    platforms
This commit is contained in:
Tim Angus 2007-08-28 16:42:13 +00:00
parent a2d413428a
commit 0b3a077e15
10 changed files with 359 additions and 1027 deletions
Download patch file Download diff file Expand all files Collapse all files

19
code/qcommon/net_chan.c
View file

@ -482,14 +482,6 @@ qboolean NET_CompareBaseAdr (netadr_t a, netadr_t b)
return qfalse;
}
if (a.type == NA_IPX)
{
if ((memcmp(a.ipx, b.ipx, 10) == 0))
return qtrue;
return qfalse;
}
Com_Printf ("NET_CompareBaseAdr: bad address type\n");
return qfalse;
}
@ -505,10 +497,6 @@ const char *NET_AdrToString (netadr_t a)
} else if (a.type == NA_IP) {
Com_sprintf (s, sizeof(s), "%i.%i.%i.%i:%hu",
a.ip[0], a.ip[1], a.ip[2], a.ip[3], BigShort(a.port));
} else {
Com_sprintf (s, sizeof(s), "%02x%02x%02x%02x.%02x%02x%02x%02x%02x%02x:%hu",
a.ipx[0], a.ipx[1], a.ipx[2], a.ipx[3], a.ipx[4], a.ipx[5], a.ipx[6], a.ipx[7], a.ipx[8], a.ipx[9],
BigShort(a.port));
}
return s;
@ -530,13 +518,6 @@ qboolean NET_CompareAdr (netadr_t a, netadr_t b)
return qfalse;
}
if (a.type == NA_IPX)
{
if ((memcmp(a.ipx, b.ipx, 10) == 0) && a.port == b.port)
return qtrue;
return qfalse;
}
Com_Printf ("NET_CompareAdr: bad address type\n");
return qfalse;
}