conditionalize including multi.h and network.h, fix backslashes
authorBradley Bell <btb@icculus.org>
Thu, 25 Oct 2001 02:15:57 +0000 (02:15 +0000)
committerBradley Bell <btb@icculus.org>
Thu, 25 Oct 2001 02:15:57 +0000 (02:15 +0000)
29 files changed:
main/ai.c
main/ai2.c
main/aipath.c
main/automap.c
main/bm.c
main/cntrlcen.c
main/collide.c
main/controls.c
main/credits.c
main/dumpmine.c
main/endlevel.c
main/escort.c
main/fireball.c
main/fuelcen.c
main/gamemine.c
main/gameseq.c
main/gauges.c
main/laser.c
main/menu.c
main/multi.h
main/netmisc.c
main/network.h
main/newdemo.c
main/newmenu.c
main/object.c
main/powerup.c
main/state.c
main/switch.c
main/wall.c

index 47365a3..0287b1e 100644 (file)
--- 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"
index a55a1be..2b78906 100644 (file)
@@ -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
index 957c669..0e72ace 100644 (file)
@@ -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.
index 8382582..03ffd1e 100644 (file)
@@ -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"
index 98092f5..8215d72 100644 (file)
--- 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"
index 73f0512..9f98ed3 100644 (file)
@@ -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"
index 6010196..13bce90 100644 (file)
@@ -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"
index 0765a5c..2c95a10 100644 (file)
@@ -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"
 
index 5e218b5..14ff1a0 100644 (file)
@@ -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"
index 2c3fd51..848b390 100644 (file)
@@ -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"
index d47e9e4..aa0daf0 100644 (file)
@@ -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"
index c856f60..b018f81 100644 (file)
@@ -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();
index fe95467..c7f4d11 100644 (file)
@@ -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"
index 20318ef..3cc40a2 100644 (file)
@@ -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.
index 7800f09..cc097ae 100644 (file)
@@ -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"             
index 7a5b8c1..47ff487 100644 (file)
@@ -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
 
 
index b4160b1..3d7bbe6 100644 (file)
@@ -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"
index 2bdbb18..183ffbf 100644 (file)
@@ -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"
index 6ac3a25..96ec9b7 100644 (file)
@@ -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)
index 3cb71fa..a8cdb04 100644 (file)
@@ -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
index 9440e97..085c127 100644 (file)
@@ -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"
index ffeab86..6b228da 100644 (file)
@@ -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
index 9048e84..1f77609 100644 (file)
@@ -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
index 3b6f425..bc9a957 100644 (file)
@@ -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"
index db3073d..126abb4 100644 (file)
@@ -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
index 03a2b5d..64479c2 100644 (file)
@@ -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;
index d17d26d..7f2d4bf 100644 (file)
@@ -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"
index 18647a2..76a9ece 100644 (file)
@@ -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];
index 64814ae..c83dac6 100644 (file)
@@ -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.