From 2004f1db8a663b30f530aeda6d2e7a6ce518c0a9 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 25 Mar 2006 21:50:32 +0000 Subject: New feature to allow compiling without multiplayer support Subversion-branch: /trunk/chocolate-doom Subversion-revision: 444 --- src/d_main.c | 6 ++-- src/d_net.c | 85 +++++++++++++++++++++++++++++++++--------------------- src/doomfeatures.h | 6 +++- src/m_misc.c | 7 +++-- 4 files changed, 66 insertions(+), 38 deletions(-) (limited to 'src') diff --git a/src/d_main.c b/src/d_main.c index 77787312..82578c3c 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: d_main.c 440 2006-03-24 21:43:43Z fraggle $ +// $Id: d_main.c 444 2006-03-25 21:50:32Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -184,7 +184,7 @@ //----------------------------------------------------------------------------- -static const char rcsid[] = "$Id: d_main.c 440 2006-03-24 21:43:43Z fraggle $"; +static const char rcsid[] = "$Id: d_main.c 444 2006-03-25 21:50:32Z fraggle $"; #define BGCOLOR 7 #define FGCOLOR 8 @@ -1647,8 +1647,10 @@ void D_DoomMain (void) printf (DEH_String("I_Init: Setting up machine state.\n")); I_Init (); +#ifdef FEATURE_MULTIPLAYER printf ("NET_Init: Initialise network subsystem.\n"); NET_Init (); +#endif printf (DEH_String("D_CheckNetGame: Checking network game status.\n")); D_CheckNetGame (); diff --git a/src/d_net.c b/src/d_net.c index 222b6a38..a7097047 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: d_net.c 441 2006-03-25 18:28:48Z fraggle $ +// $Id: d_net.c 444 2006-03-25 21:50:32Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -117,8 +117,9 @@ //----------------------------------------------------------------------------- -static const char rcsid[] = "$Id: d_net.c 441 2006-03-25 18:28:48Z fraggle $"; +static const char rcsid[] = "$Id: d_net.c 444 2006-03-25 21:50:32Z fraggle $"; +#include "doomfeatures.h" #include "d_main.h" #include "m_argv.h" @@ -196,11 +197,15 @@ void NetUpdate (void) if (singletics) return; +#ifdef FEATURE_MULTIPLAYER + // Run network subsystems NET_CL_Run(); NET_SV_Run(); +#endif + // check time nowtime = GetAdjustedTime()/ticdup; newtics = nowtime - lasttime; @@ -237,11 +242,15 @@ void NetUpdate (void) //printf ("mk:%i ",maketic); G_BuildTiccmd(&cmd); +#ifdef FEATURE_MULTIPLAYER + if (netgame && !demoplayback) { NET_CL_SendTiccmd(&cmd, maketic); } +#endif + netcmds[consoleplayer][maketic % BACKUPTICS] = cmd; ++maketic; @@ -259,8 +268,6 @@ extern int viewangleoffset; void D_CheckNetGame (void) { - net_module_t *connect_module = NULL; - char *connect_addr; int i; int num_players; @@ -281,50 +288,57 @@ void D_CheckNetGame (void) playeringame[0] = true; - // temporary hack +#ifdef FEATURE_MULTIPLAYER - if (M_CheckParm("-server") > 0) { - NET_SV_Init(); + net_module_t *connect_module = NULL; + char *connect_addr; - connect_module = &net_loop_client_module; - connect_addr = ""; - } - else - { - i = M_CheckParm("-connect"); + if (M_CheckParm("-server") > 0) + { + NET_SV_Init(); - if (i > 0) + connect_module = &net_loop_client_module; + connect_addr = ""; + } + else { - connect_module = &net_sdl_module; - connect_addr = myargv[i+1]; + i = M_CheckParm("-connect"); + + if (i > 0) + { + connect_module = &net_sdl_module; + connect_addr = myargv[i+1]; + } } - } - if (connect_module != NULL) - { - net_addr_t *addr; + if (connect_module != NULL) + { + net_addr_t *addr; - connect_module->InitClient(); + connect_module->InitClient(); - addr = connect_module->ResolveAddress(connect_addr); + addr = connect_module->ResolveAddress(connect_addr); - if (addr == NULL) - { - I_Error("Unable to resolve \"%s\"", connect_addr); - } + if (addr == NULL) + { + I_Error("Unable to resolve \"%s\"", connect_addr); + } - if (!NET_CL_Connect(addr)) - { - I_Error("D_CheckNetGame: Failed to connect to %s\n", - NET_AddrToString(addr)); - } + if (!NET_CL_Connect(addr)) + { + I_Error("D_CheckNetGame: Failed to connect to %s\n", + NET_AddrToString(addr)); + } - printf("D_CheckNetGame: Connected to %s\n", NET_AddrToString(addr)); + printf("D_CheckNetGame: Connected to %s\n", NET_AddrToString(addr)); - NET_WaitForStart(); + NET_WaitForStart(); + } } +#endif + num_players = 0; for (i=0; i #include @@ -123,6 +123,7 @@ rcsid[] = "$Id: m_misc.c 429 2006-03-23 17:43:15Z fraggle $"; #include "config.h" #include "doomdef.h" +#include "doomfeatures.h" #include "z_zone.h" @@ -401,7 +402,9 @@ static default_t extra_defaults_list[] = {"mouse_acceleration", &mouse_acceleration, DEFAULT_FLOAT}, {"show_endoom", &show_endoom}, {"vanilla_savegame_limit", &vanilla_savegame_limit}, +#ifdef FEATURE_MULTIPLAYER {"player_name", &net_player_name, DEFAULT_STRING}, +#endif }; static default_collection_t extra_defaults = -- cgit v1.2.3