summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2010-09-14 17:47:12 +0000
committerSimon Howard2010-09-14 17:47:12 +0000
commitea810eeed93cbc7e988f47841d26fc10f8c44c7c (patch)
tree2c7be03428edc258c06965fd5c063f2ed8512c18
parent523f786f2011e2592a21f47d33de7f570c8eb613 (diff)
downloadchocolate-doom-ea810eeed93cbc7e988f47841d26fc10f8c44c7c.tar.gz
chocolate-doom-ea810eeed93cbc7e988f47841d26fc10f8c44c7c.tar.bz2
chocolate-doom-ea810eeed93cbc7e988f47841d26fc10f8c44c7c.zip
Re-enable multiplayer support for Doom only, in preparation for network
code refactoring. Subversion-branch: /branches/raven-branch Subversion-revision: 2087
-rw-r--r--src/Makefile.am6
-rw-r--r--src/doomfeatures.h2
-rw-r--r--src/net_client.c5
-rw-r--r--src/net_gui.c2
4 files changed, 9 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 54450e78..55901885 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -141,9 +141,11 @@ EXTRA_LIBS = \
@SDLNET_LIBS@
if HAVE_WINDRES
-@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc
+@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc \
+ $(FEATURE_MULTIPLAYER_SOURCE_FILES)
else
-@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH)
+@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) \
+ $(FEATURE_MULTIPLAYER_SOURCE_FILES)
endif
@PROGRAM_PREFIX@doom_LDADD = doom/libdoom.a $(EXTRA_LIBS)
diff --git a/src/doomfeatures.h b/src/doomfeatures.h
index c5e6067a..46e26e52 100644
--- a/src/doomfeatures.h
+++ b/src/doomfeatures.h
@@ -37,7 +37,7 @@
// Enables multiplayer support (network games)
-//#define FEATURE_MULTIPLAYER 1
+#define FEATURE_MULTIPLAYER 1
// Enables sound output
diff --git a/src/net_client.c b/src/net_client.c
index a1697944..bf2e4e56 100644
--- a/src/net_client.c
+++ b/src/net_client.c
@@ -28,10 +28,8 @@
#include "config.h"
#include "doomtype.h"
-#include "doomstat.h"
#include "deh_main.h"
#include "deh_str.h"
-#include "g_game.h"
#include "i_system.h"
#include "i_timer.h"
#include "m_argv.h"
@@ -47,6 +45,9 @@
#include "w_checksum.h"
#include "w_wad.h"
+#include "doom/doomstat.h"
+#include "doom/g_game.h"
+
typedef enum
{
// waiting for the game to start
diff --git a/src/net_gui.c b/src/net_gui.c
index 8c848d1c..913b083d 100644
--- a/src/net_gui.c
+++ b/src/net_gui.c
@@ -268,7 +268,7 @@ void NET_WaitForStart(void)
}
I_SetWindowTitle("Waiting for game start");
- I_SetWindowIcon();
+ //I_SetWindowIcon();
BuildGUI();