From 6444493dbd51c95c2adf01526dfeeebc74c186fd Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 10 Oct 2011 20:32:02 +0000
Subject: 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
---
 src/doomfeatures.h  | 3 +--
 src/strife/d_main.c | 1 +
 src/strife/d_net.c  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/doomfeatures.h b/src/doomfeatures.h
index 1c994b70..46e26e52 100644
--- a/src/doomfeatures.h
+++ b/src/doomfeatures.h
@@ -36,9 +36,8 @@
 #define FEATURE_DEHACKED 1
 
 // Enables multiplayer support (network games)
-// STRIFE-TODO: multiplayer is currently broken ...
 
-// #define FEATURE_MULTIPLAYER 1
+#define FEATURE_MULTIPLAYER 1
 
 // Enables sound output
 
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"
-- 
cgit v1.2.3