summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
authorSimon Howard2011-10-10 20:32:02 +0000
committerSimon Howard2011-10-10 20:32:02 +0000
commit6444493dbd51c95c2adf01526dfeeebc74c186fd (patch)
tree40d748417ea3858664e3677d09d8759a9b0407c6 /src/strife
parent27413cac19e35512f3eeb0354be5261386d94751 (diff)
downloadchocolate-doom-6444493dbd51c95c2adf01526dfeeebc74c186fd.tar.gz
chocolate-doom-6444493dbd51c95c2adf01526dfeeebc74c186fd.tar.bz2
chocolate-doom-6444493dbd51c95c2adf01526dfeeebc74c186fd.zip
Re-enable FEATURE_MULTIPLAYER, but #undef it in the Strife code so the
build isn't broken. Subversion-branch: /branches/v2-branch Subversion-revision: 2411
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/d_main.c1
-rw-r--r--src/strife/d_net.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index f570d841..e8f76dd9 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -40,6 +40,7 @@
#include "dstrings.h"
#include "doomfeatures.h"
+#undef FEATURE_MULTIPLAYER // TODO: Temporary disable for Strife
#include "sounds.h"
#include "d_iwad.h"
diff --git a/src/strife/d_net.c b/src/strife/d_net.c
index 39a89e28..f999cb0f 100644
--- a/src/strife/d_net.c
+++ b/src/strife/d_net.c
@@ -28,6 +28,7 @@
#include "doomfeatures.h"
+#undef FEATURE_MULTIPLAYER // TODO: Temporary disable for Strife
#include "d_main.h"
#include "m_argv.h"