diff options
Diffstat (limited to 'src/d_net.c')
| -rw-r--r-- | src/d_net.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/d_net.c b/src/d_net.c index f404d4ca..0e9fa253 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: d_net.c 238 2006-01-01 23:54:31Z fraggle $ +// $Id: d_net.c 239 2006-01-02 00:00:08Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,9 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.12 2006/01/02 00:00:08 fraggle +// Neater prefixes: NET_Client -> NET_CL_. NET_Server -> NET_SV_. +// // Revision 1.11 2006/01/01 23:54:31 fraggle // Client disconnect code // @@ -70,7 +73,7 @@ //----------------------------------------------------------------------------- -static const char rcsid[] = "$Id: d_net.c 238 2006-01-01 23:54:31Z fraggle $"; +static const char rcsid[] = "$Id: d_net.c 239 2006-01-02 00:00:08Z fraggle $"; #include "m_menu.h" @@ -425,8 +428,8 @@ void NetUpdate (void) // Temporary hack - hook new client/server code into Doom - NET_ClientRun(); - NET_ServerRun(); + NET_CL_Run(); + NET_SV_Run(); // check time nowtime = I_GetTime ()/ticdup; @@ -621,13 +624,13 @@ void D_CheckNetGame (void) if (M_CheckParm("-server") > 0) { net_addr_t *addr; - NET_ServerInit(); + NET_SV_Init(); addr = net_loop_client_module.ResolveAddress(""); printf("address resolved: %p\n", addr); - if (NET_ClientConnect(addr)) + if (NET_CL_Connect(addr)) { printf("connected to local server\n"); } @@ -687,7 +690,7 @@ void D_QuitNetGame (void) if (debugfile) fclose (debugfile); - NET_ClientDisconnect(); + NET_CL_Disconnect(); if (!netgame || !usergame || consoleplayer == -1 || demoplayback) return; |