From 413f2a34abfb9e556819de28b7a4dbf77655d0ee Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Thu, 25 Oct 2001 02:15:57 +0000
Subject: [PATCH] conditionalize including multi.h and network.h, fix
 backslashes

---
 main/ai.c       |  6 ++++--
 main/ai2.c      |  8 +++++---
 main/aipath.c   |  2 +-
 main/automap.c  |  5 ++++-
 main/bm.c       |  9 +++++++--
 main/cntrlcen.c |  4 +++-
 main/collide.c  | 13 ++++++++++---
 main/controls.c |  4 +++-
 main/credits.c  |  4 +++-
 main/dumpmine.c |  4 ++--
 main/endlevel.c |  4 +++-
 main/escort.c   |  2 +-
 main/fireball.c |  4 ++++
 main/fuelcen.c  |  4 +++-
 main/gamemine.c |  4 ++--
 main/gameseq.c  |  8 ++++++--
 main/gauges.c   |  2 ++
 main/laser.c    |  4 +++-
 main/menu.c     |  4 +++-
 main/multi.h    | 16 ++++++++++++----
 main/netmisc.c  |  4 +++-
 main/network.h  | 13 +++++++++++--
 main/newdemo.c  |  4 +++-
 main/newmenu.c  |  4 +++-
 main/object.c   | 11 ++++++++---
 main/powerup.c  |  2 +-
 main/state.c    |  4 +++-
 main/switch.c   |  6 ++++--
 main/wall.c     |  4 ++--
 29 files changed, 119 insertions(+), 44 deletions(-)

diff --git a/main/ai.c b/main/ai.c
index 47365a37..0287b1e9 100644
--- a/main/ai.c
+++ b/main/ai.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <conf.h>
 #endif
 
-char ai_rcsid[] = "$Id: ai.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $";
+char ai_rcsid[] = "$Id: ai.c,v 1.3 2001-10-25 02:15:55 bradleyb Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,8 +48,10 @@ char ai_rcsid[] = "$Id: ai.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $";
 #include "sounds.h"
 #include "cntrlcen.h"
 #include "multibot.h"
+#ifdef NETWORK
 #include "multi.h"
 #include "network.h"
+#endif
 #include "gameseq.h"
 #include "key.h"
 #include "powerup.h"
@@ -60,7 +62,7 @@ char ai_rcsid[] = "$Id: ai.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $";
 #include "kconfig.h"
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 #include "string.h"
diff --git a/main/ai2.c b/main/ai2.c
index a55a1bee..2b789065 100644
--- a/main/ai2.c
+++ b/main/ai2.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: ai2.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $";
+static char rcsid[] = "$Id: ai2.c,v 1.3 2001-10-25 02:15:55 bradleyb Exp $";
 #endif
 
 #include <stdio.h>
@@ -51,8 +51,10 @@ static char rcsid[] = "$Id: ai2.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $";
 #include "sounds.h"
 #include "cntrlcen.h"
 #include "multibot.h"
+#ifdef NETWORK
 #include "multi.h"
 #include "network.h"
+#endif
 #include "gameseq.h"
 #include "key.h"
 #include "powerup.h"
@@ -60,8 +62,8 @@ static char rcsid[] = "$Id: ai2.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $";
 #include "text.h"
 
 #ifdef EDITOR
-#include "editor\editor.h"
-#include "editor\kdefs.h"
+#include "editor/editor.h"
+#include "editor/kdefs.h"
 #endif
 
 #ifndef NDEBUG
diff --git a/main/aipath.c b/main/aipath.c
index 957c669a..0e72acea 100644
--- a/main/aipath.c
+++ b/main/aipath.c
@@ -39,7 +39,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "maths.h"
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 #define	PARALLAX	0		//	If !0, then special debugging for Parallax eyes enabled.
diff --git a/main/automap.c b/main/automap.c
index 8382582e..03ffd1e3 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -51,15 +51,18 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "wall.h"
 #include "gameseq.h"
 #include "gamefont.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "kconfig.h"
+#ifdef NETWORK
 #include "multi.h"
+#endif
 #include "endlevel.h"
 #include "text.h"
 #include "gauges.h"
 #include "songs.h"
 #include "powerup.h"
-#include "network.h"
 #include "switch.h"
 #include "automap.h"
 #include "cntrlcen.h"
diff --git a/main/bm.c b/main/bm.c
index 98092f5f..8215d729 100644
--- a/main/bm.c
+++ b/main/bm.c
@@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 /*
  * $Source: /cvs/cvsroot/d2x/main/bm.c,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  * $Author: bradleyb $
- * $Date: 2001-10-19 08:06:20 $
+ * $Date: 2001-10-25 02:15:55 $
  *
  * Bitmap and palette loading functions.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.4  2001/10/19 08:06:20  bradleyb
+ * Partial application of linux/alpha patch.  Courtesy of Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
+ *
  *
  */
 
@@ -44,7 +47,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "wall.h"
 #include "textures.h"
 #include "game.h"
+#ifdef NETWORK
 #include "multi.h"
+#endif
 #include "iff.h"
 #include "cfile.h"
 #include "powerup.h"
diff --git a/main/cntrlcen.c b/main/cntrlcen.c
index 73f0512e..9f98ed3f 100644
--- a/main/cntrlcen.c
+++ b/main/cntrlcen.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: cntrlcen.c,v 1.2 2001-01-31 15:17:49 bradleyb Exp $";
+static char rcsid[] = "$Id: cntrlcen.c,v 1.3 2001-10-25 02:15:55 bradleyb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -37,7 +37,9 @@ static char rcsid[] = "$Id: cntrlcen.c,v 1.2 2001-01-31 15:17:49 bradleyb Exp $"
 #include "laser.h"
 #include "gameseq.h"
 #include "ai.h"
+#ifdef NETWORK
 #include "multi.h"
+#endif
 #include "wall.h"
 #include "object.h"
 #include "robot.h"
diff --git a/main/collide.c b/main/collide.c
index 6010196d..13bce909 100644
--- a/main/collide.c
+++ b/main/collide.c
@@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 /*
  * $Source: /cvs/cvsroot/d2x/main/collide.c,v $
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  * $Author: bradleyb $
- * $Date: 2001-10-18 00:01:00 $
+ * $Date: 2001-10-25 02:15:55 $
  *
  * FIXME: put description here
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.7  2001/10/18 00:01:00  bradleyb
+ * RCS headers added/changed
+ *
  *
  */
 
@@ -64,12 +67,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "player.h"
 #include "gauges.h"
 #include "powerup.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "newmenu.h"
 #include "scores.h"
 #include "effects.h"
 #include "textures.h"
+#ifdef NETWORK
 #include "multi.h"
+#endif
 #include "cntrlcen.h"
 #include "newdemo.h"
 #include "endlevel.h"
@@ -85,7 +92,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif 
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 #include "collide.h"
diff --git a/main/controls.c b/main/controls.c
index 0765a5c6..2c95a10b 100644
--- a/main/controls.c
+++ b/main/controls.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: controls.c,v 1.2 2001-01-31 15:17:49 bradleyb Exp $";
+static char rcsid[] = "$Id: controls.c,v 1.3 2001-10-25 02:15:55 bradleyb Exp $";
 #endif
 
 #include <stdio.h>
@@ -42,7 +42,9 @@ static char rcsid[] = "$Id: controls.c,v 1.2 2001-01-31 15:17:49 bradleyb Exp $"
 #include "mouse.h"
 #include "kconfig.h"
 #include "laser.h"
+#ifdef NETWORK
 #include "multi.h"
+#endif
 #include "vclip.h"
 #include "fireball.h"
 
diff --git a/main/credits.c b/main/credits.c
index 5e218b52..14ff1a07 100644
--- a/main/credits.c
+++ b/main/credits.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: credits.c,v 1.3 2001-01-31 15:17:50 bradleyb Exp $";
+static char rcsid[] = "$Id: credits.c,v 1.4 2001-10-25 02:15:55 bradleyb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -42,7 +42,9 @@ static char rcsid[] = "$Id: credits.c,v 1.3 2001-01-31 15:17:50 bradleyb Exp $";
 
 #include "newmenu.h"
 #include "gamefont.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "iff.h"
 #include "pcx.h"
 #include "u_mem.h"
diff --git a/main/dumpmine.c b/main/dumpmine.c
index 2c3fd51a..848b3905 100644
--- a/main/dumpmine.c
+++ b/main/dumpmine.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: dumpmine.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $";
+static char rcsid[] = "$Id: dumpmine.c,v 1.3 2001-10-25 02:15:56 bradleyb Exp $";
 #endif
 
 #include <stdio.h>
@@ -32,7 +32,7 @@ static char rcsid[] = "$Id: dumpmine.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $"
 
 #include "inferno.h"
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 #include "error.h"
 #include "object.h"
diff --git a/main/endlevel.c b/main/endlevel.c
index d47e9e46..aa0daf06 100644
--- a/main/endlevel.c
+++ b/main/endlevel.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: endlevel.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $";
+static char rcsid[] = "$Id: endlevel.c,v 1.3 2001-10-25 02:15:56 bradleyb Exp $";
 #endif
 
 //#define SLEW_ON 1
@@ -57,7 +57,9 @@ static char rcsid[] = "$Id: endlevel.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $"
 #include "multi.h"
 #include "vclip.h"
 #include "fireball.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "text.h"
 #include "digi.h"
 #include "cfile.h"
diff --git a/main/escort.c b/main/escort.c
index c856f601..b018f810 100644
--- a/main/escort.c
+++ b/main/escort.c
@@ -54,7 +54,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "pa_enabl.h"
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 extern void multi_send_stolen_items();
diff --git a/main/fireball.c b/main/fireball.c
index fe95467a..c7f4d116 100644
--- a/main/fireball.c
+++ b/main/fireball.c
@@ -41,13 +41,17 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "fireball.h"
 #include "collide.h"
 #include "newmenu.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "gameseq.h"
 #include "physics.h"
 #include "scores.h"
 #include "laser.h"
 #include "wall.h"
+#ifdef NETWORK
 #include "multi.h"
+#endif
 #include "endlevel.h"
 #include "timer.h"
 #include "fuelcen.h"
diff --git a/main/fuelcen.c b/main/fuelcen.c
index 20318ef9..3cc40a22 100644
--- a/main/fuelcen.c
+++ b/main/fuelcen.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: fuelcen.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $";
+static char rcsid[] = "$Id: fuelcen.c,v 1.3 2001-10-25 02:15:56 bradleyb Exp $";
 #endif
 
 #include <stdio.h>
@@ -47,8 +47,10 @@ static char rcsid[] = "$Id: fuelcen.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $";
 #include "player.h"
 #include "collide.h"
 #include "laser.h"
+#ifdef NETWORK
 #include "network.h"
 #include "multi.h"
+#endif
 #include "multibot.h"
 
 // The max number of fuel stations per mine.
diff --git a/main/gamemine.c b/main/gamemine.c
index 7800f096..cc097ae2 100644
--- a/main/gamemine.c
+++ b/main/gamemine.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: gamemine.c,v 1.2 2001-01-31 15:17:52 bradleyb Exp $";
+static char rcsid[] = "$Id: gamemine.c,v 1.3 2001-10-25 02:15:56 bradleyb Exp $";
 #endif
 
 #include <stdio.h>
@@ -41,7 +41,7 @@ static char rcsid[] = "$Id: gamemine.c,v 1.2 2001-01-31 15:17:52 bradleyb Exp $"
 #include "newmenu.h"
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 #include "cfile.h"		
diff --git a/main/gameseq.c b/main/gameseq.c
index 7a5b8c1d..47ff4872 100644
--- a/main/gameseq.c
+++ b/main/gameseq.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-char gameseq_rcsid[] = "$Id: gameseq.c,v 1.4 2001-01-31 15:17:53 bradleyb Exp $";
+char gameseq_rcsid[] = "$Id: gameseq.c,v 1.5 2001-10-25 02:15:56 bradleyb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -80,7 +80,9 @@ char gameseq_rcsid[] = "$Id: gameseq.c,v 1.4 2001-01-31 15:17:53 bradleyb Exp $"
 #include "gamefont.h"
 #include "newmenu.h"
 #include "endlevel.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "playsave.h"
 #include "ctype.h"
 #include "multi.h"
@@ -100,7 +102,9 @@ char gameseq_rcsid[] = "$Id: gameseq.c,v 1.4 2001-01-31 15:17:53 bradleyb Exp $"
 #include "mission.h"
 #include "state.h"
 #include "songs.h"
+#ifdef NETWORK
 #include "netmisc.h"
+#endif
 #include "gamepal.h"
 #include "movie.h"
 #include "controls.h"
@@ -114,7 +118,7 @@ char gameseq_rcsid[] = "$Id: gameseq.c,v 1.4 2001-01-31 15:17:53 bradleyb Exp $"
 #endif
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 
diff --git a/main/gauges.c b/main/gauges.c
index b4160b10..3d7bbe6d 100644
--- a/main/gauges.c
+++ b/main/gauges.c
@@ -40,8 +40,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "text.h"
 #include "powerup.h"
 #include "sounds.h"
+#ifdef NETWORK
 #include "multi.h"
 #include "network.h"
+#endif
 #include "endlevel.h"
 #include "cntrlcen.h"
 #include "controls.h"
diff --git a/main/laser.c b/main/laser.c
index 2bdbb18b..183ffbfe 100644
--- a/main/laser.c
+++ b/main/laser.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-char laser_rcsid[] = "$Id: laser.c,v 1.3 2001-01-31 15:17:54 bradleyb Exp $";
+char laser_rcsid[] = "$Id: laser.c,v 1.4 2001-10-25 02:15:56 bradleyb Exp $";
 #endif
 
 #include <stdlib.h>
@@ -46,7 +46,9 @@ char laser_rcsid[] = "$Id: laser.c,v 1.3 2001-01-31 15:17:54 bradleyb Exp $";
 #include "timer.h"
 #include "player.h"
 #include "sounds.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "ai.h"
 #include "modem.h"
 #include "powerup.h"
diff --git a/main/menu.c b/main/menu.c
index 6ac3a25e..96ec9b71 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -47,7 +47,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "text.h"
 #include "gamefont.h"
 #include "newmenu.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "scores.h"
 #include "joydefs.h"
 #include "modem.h"
@@ -75,7 +77,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 #if defined(POLY_ACC)
diff --git a/main/multi.h b/main/multi.h
index 3cb71fa4..a8cdb041 100644
--- a/main/multi.h
+++ b/main/multi.h
@@ -11,13 +11,23 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
 COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
+/*
+ * $Source: /cvs/cvsroot/d2x/main/multi.h,v $
+ * $Revision: 1.2 $
+ * $Author: bradleyb $
+ * $Date: 2001-10-25 02:15:56 $
+ *
+ * FIXME: put description here
+ *
+ * $Log: not supported by cvs2svn $
+ *
+ */
+
 #ifndef _MULTI_H
 #define _MULTI_H
 
 #define MAX_MESSAGE_LEN 35
 
-#ifdef NETWORK
-
 // Defines
 #include "gameseq.h"
 #include "piggy.h"
@@ -413,6 +423,4 @@ void change_playernum_to(int new_pnum);
 #define FLARE_ADJUST		127
 
 
-#endif
-
 #endif
diff --git a/main/netmisc.c b/main/netmisc.c
index 9440e976..085c127b 100644
--- a/main/netmisc.c
+++ b/main/netmisc.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: netmisc.c,v 1.2 2001-01-31 15:17:54 bradleyb Exp $";
+static char rcsid[] = "$Id: netmisc.c,v 1.3 2001-10-25 02:15:57 bradleyb Exp $";
 #endif
 
 #include <stdio.h>
@@ -130,7 +130,9 @@ ushort netmisc_calc_checksum_pc( void * vptr, int len )
 #include "ipx.h"
 #include "byteswap.h"
 #include "multi.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "object.h"
 #include "powerup.h"
 #include "error.h"
diff --git a/main/network.h b/main/network.h
index ffeab864..6b228da7 100644
--- a/main/network.h
+++ b/main/network.h
@@ -11,7 +11,17 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
 COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
-#ifdef NETWORK
+/*
+ * $Source: /cvs/cvsroot/d2x/main/network.h,v $
+ * $Revision: 1.4 $
+ * $Author: bradleyb $
+ * $Date: 2001-10-25 02:15:57 $
+ *
+ * FIXME: put description here
+ *
+ * $Log: not supported by cvs2svn $
+ *
+ */
 
 #ifndef _NETWORK_H
 #define _NETWORK_H
@@ -151,4 +161,3 @@ int GetMyNetRanking();
 int HoardEquipped();
 
 #endif
-#endif
diff --git a/main/newdemo.c b/main/newdemo.c
index 9048e845..1f776094 100644
--- a/main/newdemo.c
+++ b/main/newdemo.c
@@ -70,7 +70,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "args.h"
 #include "palette.h"
 #include "multi.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "text.h"
 #include "cntrlcen.h"
 #include "aistruct.h"
@@ -83,7 +85,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "findfile.h"
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 #ifdef MACINTOSH
diff --git a/main/newmenu.c b/main/newmenu.c
index 3b6f4253..bc9a957d 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: newmenu.c,v 1.3 2001-01-31 15:17:56 bradleyb Exp $";
+static char rcsid[] = "$Id: newmenu.c,v 1.4 2001-10-25 02:15:57 bradleyb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -46,7 +46,9 @@ static char rcsid[] = "$Id: newmenu.c,v 1.3 2001-01-31 15:17:56 bradleyb Exp $";
 #include "newmenu.h"
 #include "gamefont.h"
 #include "gamepal.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "iff.h"
 #include "pcx.h"
 #include "u_mem.h"
diff --git a/main/object.c b/main/object.c
index db3073d9..126abb4f 100644
--- a/main/object.c
+++ b/main/object.c
@@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 /*
  * $Source: /cvs/cvsroot/d2x/main/object.c,v $
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  * $Author: bradleyb $
- * $Date: 2001-10-18 00:01:01 $
+ * $Date: 2001-10-25 02:15:57 $
  *
  * FIXME: put description here
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.7  2001/10/18 00:01:01  bradleyb
+ * RCS headers added/changed
+ *
  *
  */
 
@@ -75,7 +78,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "newdemo.h"
 #include "player.h"
 #include "weapon.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "newmenu.h"
 #include "gauges.h"
 #include "multi.h"
@@ -91,7 +96,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 #ifdef _3DFX
diff --git a/main/powerup.c b/main/powerup.c
index 03a2b5d9..64479c23 100644
--- a/main/powerup.c
+++ b/main/powerup.c
@@ -53,7 +53,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #ifdef EDITOR
 #include "gr.h"	//	for powerup outline drawing
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 int N_powerup_types = 0;
diff --git a/main/state.c b/main/state.c
index d17d26dc..7f2d4bfb 100644
--- a/main/state.c
+++ b/main/state.c
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 
 #ifdef RCS
-char state_rcsid[] = "$Id: state.c,v 1.3 2001-01-31 14:04:45 bradleyb Exp $";
+char state_rcsid[] = "$Id: state.c,v 1.4 2001-10-25 02:15:57 bradleyb Exp $";
 #endif
 
 #include <conf.h>
@@ -71,7 +71,9 @@ char state_rcsid[] = "$Id: state.c,v 1.3 2001-01-31 14:04:45 bradleyb Exp $";
 #include "mission.h"
 #include "pcx.h"
 #include "u_mem.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "args.h"
 #include "ai.h"
 #include "fireball.h"
diff --git a/main/switch.c b/main/switch.c
index 18647a24..76a9ece9 100644
--- a/main/switch.c
+++ b/main/switch.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: switch.c,v 1.3 2001-01-31 15:17:57 bradleyb Exp $";
+static char rcsid[] = "$Id: switch.c,v 1.4 2001-10-25 02:15:57 bradleyb Exp $";
 #endif
 
 #include <stdio.h>
@@ -42,13 +42,15 @@ static char rcsid[] = "$Id: switch.c,v 1.3 2001-01-31 15:17:57 bradleyb Exp $";
 #include "endlevel.h"
 #include "gameseq.h"
 #include "multi.h"
+#ifdef NETWORK
 #include "network.h"
+#endif
 #include "palette.h"
 #include "robot.h"
 #include "bm.h"
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 trigger Triggers[MAX_TRIGGERS];
diff --git a/main/wall.c b/main/wall.c
index 64814aee..c83dac63 100644
--- a/main/wall.c
+++ b/main/wall.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: wall.c,v 1.3 2001-01-31 15:17:59 bradleyb Exp $";
+static char rcsid[] = "$Id: wall.c,v 1.4 2001-10-25 02:15:57 bradleyb Exp $";
 #endif
 
 #include <stdio.h>
@@ -50,7 +50,7 @@ static char rcsid[] = "$Id: wall.c,v 1.3 2001-01-31 15:17:59 bradleyb Exp $";
 #include "effects.h"
 
 #ifdef EDITOR
-#include "editor\editor.h"
+#include "editor/editor.h"
 #endif
 
 //	Special door on boss level which is locked if not in multiplayer...sorry for this awful solution --MK.
-- 
2.39.2