X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=net_win.c;h=85c08a113a35818aac2e9dcf1257750214976a9b;hp=019a9c7271759a6928d926ffe5fbb8d090e20710;hb=588f270dc2ff7d5aa5896a6b9c7f5ec3c5f14f04;hpb=8dcce44300385b12c46d494c06aadcfa35a8bc14

diff --git a/net_win.c b/net_win.c
index 019a9c72..85c08a11 100644
--- a/net_win.c
+++ b/net_win.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "net_loop.h"
 #include "net_dgrm.h"
-//#include "net_ser.h"
 
 net_driver_t net_drivers[MAX_NET_DRIVERS] =
 {
@@ -31,6 +30,7 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 	Loop_Init,
 	Loop_Listen,
 	Loop_SearchForHosts,
+	Loop_SearchForInetHosts,
 	Loop_Connect,
 	Loop_CheckNewConnections,
 	Loop_GetMessage,
@@ -39,7 +39,8 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 	Loop_CanSendMessage,
 	Loop_CanSendUnreliableMessage,
 	Loop_Close,
-	Loop_Shutdown
+	Loop_Shutdown,
+	Loop_Heartbeat
 	}
 	,
 	{
@@ -48,6 +49,7 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 	Datagram_Init,
 	Datagram_Listen,
 	Datagram_SearchForHosts,
+	Datagram_SearchForInetHosts,
 	Datagram_Connect,
 	Datagram_CheckNewConnections,
 	Datagram_GetMessage,
@@ -56,7 +58,8 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 	Datagram_CanSendMessage,
 	Datagram_CanSendUnreliableMessage,
 	Datagram_Close,
-	Datagram_Shutdown
+	Datagram_Shutdown,
+	Datagram_Heartbeat
 	}
 };
 
@@ -79,6 +82,8 @@ net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
 	WINS_CloseSocket,
 	WINS_Connect,
 	WINS_CheckNewConnections,
+	WINS_Recv,
+	WINS_Send,
 	WINS_Read,
 	WINS_Write,
 	WINS_Broadcast,
@@ -90,31 +95,8 @@ net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
 	WINS_AddrCompare,
 	WINS_GetSocketPort,
 	WINS_SetSocketPort
-	},
-	{
-	"Winsock IPX",
-	false,
-	0,
-	WIPX_Init,
-	WIPX_Shutdown,
-	WIPX_Listen,
-	WIPX_OpenSocket,
-	WIPX_CloseSocket,
-	WIPX_Connect,
-	WIPX_CheckNewConnections,
-	WIPX_Read,
-	WIPX_Write,
-	WIPX_Broadcast,
-	WIPX_AddrToString,
-	WIPX_StringToAddr,
-	WIPX_GetSocketAddr,
-	WIPX_GetNameFromAddr,
-	WIPX_GetAddrFromName,
-	WIPX_AddrCompare,
-	WIPX_GetSocketPort,
-	WIPX_SetSocketPort
 	}
-
 };
 
-int net_numlandrivers = 2;
+int net_numlandrivers = 1;
+