diff options
author | Simon Howard | 2011-10-13 20:07:52 +0000 |
---|---|---|
committer | Simon Howard | 2011-10-13 20:07:52 +0000 |
commit | de3a8f767826d1aeb887da5e24140cd29790abf4 (patch) | |
tree | 453e21f856465120f1c5599f032486d8203560f3 /src/heretic/d_main.c | |
parent | cb142afe2e4bfa756249cd0e7e17ddd3ec820a87 (diff) | |
download | chocolate-doom-de3a8f767826d1aeb887da5e24140cd29790abf4.tar.gz chocolate-doom-de3a8f767826d1aeb887da5e24140cd29790abf4.tar.bz2 chocolate-doom-de3a8f767826d1aeb887da5e24140cd29790abf4.zip |
Convert Heretic code to use common main loop code. Working multiplayer!
Subversion-branch: /branches/v2-branch
Subversion-revision: 2417
Diffstat (limited to 'src/heretic/d_main.c')
-rw-r--r-- | src/heretic/d_main.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c index 9c282491..da4256ee 100644 --- a/src/heretic/d_main.c +++ b/src/heretic/d_main.c @@ -27,9 +27,13 @@ #include <stdio.h> #include <stdlib.h> +#include "doomfeatures.h" + #include "txt_main.h" #include "txt_io.h" +#include "net_client.h" + #include "config.h" #include "ct_chat.h" #include "doomdef.h" @@ -80,9 +84,6 @@ FILE *debugfile; static int show_endoom = 1; void D_CheckNetGame(void); -void D_ProcessEvents(void); -void G_BuildTiccmd(ticcmd_t * cmd); -void D_DoAdvanceDemo(void); void D_PageDrawer(void); void D_AdvanceDemo(void); void F_Drawer(void); @@ -254,22 +255,8 @@ void D_DoomLoop(void) I_StartFrame(); // Process one or more tics - if (singletics) - { - I_StartTic(); - D_ProcessEvents(); - G_BuildTiccmd(&netcmds[consoleplayer][maketic % BACKUPTICS]); - if (advancedemo) - D_DoAdvanceDemo(); - G_Ticker(); - gametic++; - maketic++; - } - else - { - // Will run at least one tic - TryRunTics(); - } + // Will run at least one tic + TryRunTics(); // Move positional sounds S_UpdateSounds(players[consoleplayer].mo); @@ -977,6 +964,11 @@ void D_DoomMain(void) tprintf(DEH_String("MN_Init: Init menu system.\n"), 1); MN_Init(); +#ifdef FEATURE_MULTIPLAYER + tprintf ("NET_Init: Init network subsystem.\n", 1); + NET_Init (); +#endif + CT_Init(); tprintf(DEH_String("R_Init: Init Heretic refresh daemon."), 1); |