removed winsock_initialized counter as there are no longer two things initializing...

[xonotic/darkplaces.git] / net_win.c

diff --git a/net_win.c b/net_win.c
index d34348cdea22433e1b9e3de651721623f75ed5d1..3bd5d1d65811c7b81b89e94f0cdc5365a857b20f 100644 (file)
--- 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.
 
@@ -30,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,
@@ -38,7 +39,8 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
        Loop_CanSendMessage,
        Loop_CanSendUnreliableMessage,
        Loop_Close,
-       Loop_Shutdown
+       Loop_Shutdown,
+       Loop_Heartbeat
        }
        ,
        {
@@ -47,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,
@@ -55,7 +58,8 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
        Datagram_CanSendMessage,
        Datagram_CanSendUnreliableMessage,
        Datagram_Close,
-       Datagram_Shutdown
+       Datagram_Shutdown,
+       Datagram_Heartbeat
        }
 };
 
@@ -63,7 +67,6 @@ int net_numdrivers = 2;
 
 
 #include "net_wins.h"
-#include "net_wipx.h"
 
 net_landriver_t        net_landrivers[MAX_NET_DRIVERS] =
 {
@@ -78,6 +81,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,
@@ -89,32 +94,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;