diff options
| author | Simon Howard | 2010-12-11 01:01:45 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-12-11 01:01:45 +0000 |
| commit | 59d5d0d646f3d4ca1eb2370154db4b4371185e2f (patch) | |
| tree | 692685ad3f7cc33222cdbbc010a5d46c2bb372a0 | |
| parent | ec3323b9ec5adbb2f24ec67dab1ef776ec7fc559 (diff) | |
| download | chocolate-doom-59d5d0d646f3d4ca1eb2370154db4b4371185e2f.tar.gz chocolate-doom-59d5d0d646f3d4ca1eb2370154db4b4371185e2f.tar.bz2 chocolate-doom-59d5d0d646f3d4ca1eb2370154db4b4371185e2f.zip | |
Fix problem with -autojoin apparently caused by merge error.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2218
| -rw-r--r-- | src/doom/d_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doom/d_net.c b/src/doom/d_net.c index 93a48b41..73e7368f 100644 --- a/src/doom/d_net.c +++ b/src/doom/d_net.c @@ -479,6 +479,7 @@ boolean D_InitNetGame(net_connect_data_t *connect_data, NET_SV_Init(); NET_SV_AddModule(&net_loop_server_module); NET_SV_AddModule(&net_sdl_module); + NET_SV_RegisterWithMaster(); net_loop_client_module.InitClient(); addr = net_loop_client_module.ResolveAddress(NULL); @@ -497,7 +498,6 @@ boolean D_InitNetGame(net_connect_data_t *connect_data, if (i > 0) { addr = NET_FindLANServer(); - NET_SV_RegisterWithMaster(); if (addr == NULL) { |