shithub: choc

Info  •  Files  •  Log  •  Branches

Re-enable multiplayer support for Doom only, in preparation for network
code refactoring.

Subversion-branch: /branches/raven-branch
Subversion-revision: 2087

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -141,9 +141,11 @@

                @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)

--- 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

--- 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"

@@ -46,6 +44,9 @@

 #include "net_structrw.h"

 #include "w_checksum.h"

 #include "w_wad.h"

+

+#include "doom/doomstat.h"

+#include "doom/g_game.h"

 typedef enum

 {

--- a/src/net_gui.c

+++ b/src/net_gui.c

@@ -268,7 +268,7 @@

     }

     I_SetWindowTitle("Waiting for game start");

-    I_SetWindowIcon();

+    //I_SetWindowIcon();

     BuildGUI();