From afe71dfac6152149c2a9313695fb1b53ecd37255 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 31 Jan 2001 15:18:05 +0000 Subject: [PATCH] Makefile and conf.h fixes --- 2d/Makefile.am | 7 +++++++ 2d/bitblt.c | 3 +++ 2d/bitmap.c | 3 +++ 2d/box.c | 4 +++- 2d/canvas.c | 3 +++ 2d/circle.c | 7 +++++-- 2d/disc.c | 3 +++ 2d/font.c | 3 +++ 2d/gpixel.c | 3 +++ 2d/ibitblt.c | 2 ++ 2d/line.c | 3 +++ 2d/palette.c | 3 +++ 2d/pcx.c | 3 +++ 2d/pixel.c | 3 +++ 2d/poly.c | 3 +++ 2d/rect.c | 3 +++ 2d/rle.c | 7 +++++-- 2d/scale.c | 13 +++++++++---- 2d/scalec.c | 4 ++++ 2d/tmerge.c | 6 ++---- 3d/clipper.c | 4 ++++ 3d/draw.c | 7 +++++-- 3d/globvars.c | 14 ++++++++++---- 3d/instance.c | 14 ++++++++++---- 3d/interp.c | 16 +++++++++++----- 3d/matrix.c | 13 +++++++++---- 3d/points.c | 15 ++++++++++----- 3d/rod.c | 14 ++++++++++---- 3d/setup.c | 13 +++++++++---- arch/Makefile.am | 5 +++++ cfile/cfile.c | 3 +++ iff/iff.c | 8 +++++--- main/ai.c | 7 +++++-- main/ai2.c | 6 ++++-- main/aipath.c | 3 +++ main/automap.c | 4 +++- main/bm.c | 7 +++++-- main/bmread.c | 7 ++++--- main/cmd.c | 3 +++ main/cntrlcen.c | 7 +++++-- main/collide.c | 6 ++++-- main/config.c | 6 ++++-- main/console.c | 3 +++ main/controls.c | 6 ++++-- main/credits.c | 6 ++++-- main/crypt.c | 7 +++++-- main/dumpmine.c | 6 ++++-- main/effects.c | 6 ++++-- main/endlevel.c | 8 +++++--- main/escort.c | 4 +++- main/fireball.c | 4 +++- main/fuelcen.c | 6 ++++-- main/fvi.c | 4 +++- main/game.c | 7 +++++-- main/gamecntl.c | 4 +++- main/gamefont.c | 6 ++++-- main/gamemine.c | 7 +++++-- main/gamepal.c | 4 +++- main/gamerend.c | 7 ++++--- main/gamesave.c | 7 +++++-- main/gameseg.c | 6 ++++-- main/gameseq.c | 6 ++++-- main/hostage.c | 7 +++++-- main/kconfig.c | 7 ++++--- main/kmatrix.c | 7 ++++--- main/laser.c | 7 ++++--- main/lighting.c | 6 ++++-- main/mglobal.c | 7 +++++-- main/mission.c | 7 ++++--- main/morph.c | 7 ++++--- main/netmisc.c | 7 ++++--- main/network.c | 8 +++++--- main/newdemo.c | 3 ++- main/newmenu.c | 7 ++++--- main/object.c | 7 ++++--- main/paging.c | 7 ++++--- main/physics.c | 8 +++++--- main/piggy.c | 6 ++++-- main/polyobj.c | 9 +++++---- main/powerup.c | 3 ++- main/render.c | 7 +++++-- main/robot.c | 3 ++- main/slew.c | 7 +++++-- main/songs.c | 3 ++- main/switch.c | 7 ++++--- main/texmerge.c | 2 ++ main/text.c | 7 ++++--- main/titles.c | 2 ++ main/vclip.c | 7 ++++--- main/wall.c | 7 ++++--- main/weapon.c | 7 ++++--- maths/Makefile.am | 4 ++++ maths/fixc.c | 19 +++++++++++-------- maths/rand.c | 3 +++ maths/tables.c | 10 ++++++++-- maths/vecmat.c | 14 ++++++++++---- mem/mem.c | 6 ++++-- misc/args.c | 13 +++++++++---- misc/byteswap.c | 3 +++ misc/d_delay.c | 4 ++++ misc/d_glob.c | 4 ++++ misc/d_io.c | 4 ++++ misc/error.c | 14 ++++++++++---- misc/hash.c | 7 +++++-- misc/strio.c | 4 ++++ misc/strutil.c | 3 +++ texmap/Makefile.am | 6 ++++-- texmap/ntmap.c | 15 ++++++++++----- texmap/scanline.c | 13 +++++++++---- texmap/tmapflat.c | 9 +++++++-- 110 files changed, 510 insertions(+), 206 deletions(-) diff --git a/2d/Makefile.am b/2d/Makefile.am index 076456f2..ddbb31ec 100644 --- a/2d/Makefile.am +++ b/2d/Makefile.am @@ -1,10 +1,17 @@ noinst_LIBRARIES = lib2d.a INCLUDES = -I $(top_srcdir)/includes +if USE_ASM +lib2d_a_SOURCES = \ +2dsline.c box.c disc.c ibitblt.c pcx.c rect.c scalec.c \ +bitblt.c canvas.c font.c line.c pixel.c rle.c \ +bitmap.c circle.c gpixel.c palette.c poly.c +else lib2d_a_SOURCES = \ 2dsline.c box.c disc.c ibitblt.c pcx.c rect.c scalec.c \ bitblt.c canvas.c font.c line.c pixel.c rle.c tmerge.c \ bitmap.c circle.c gpixel.c palette.c poly.c +endif SUFFIXES = .asm %.o: %.asm diff --git a/2d/bitblt.c b/2d/bitblt.c index 3efdc777..98354231 100644 --- a/2d/bitblt.c +++ b/2d/bitblt.c @@ -11,7 +11,10 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include "u_mem.h" #include "gr.h" diff --git a/2d/bitmap.c b/2d/bitmap.c index 740e4855..92ec8a63 100644 --- a/2d/bitmap.c +++ b/2d/bitmap.c @@ -11,7 +11,10 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include diff --git a/2d/box.c b/2d/box.c index 019838a1..bb6f08b7 100644 --- a/2d/box.c +++ b/2d/box.c @@ -11,7 +11,10 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +#ifdef HAVE_CONFIG_H #include +#endif + #include "u_mem.h" @@ -122,4 +125,3 @@ void gr_box(int left,int top,int right,int bot) else gr_ubox12( left, top, right, bot ); } - diff --git a/2d/canvas.c b/2d/canvas.c index 3956c371..0b7956c6 100644 --- a/2d/canvas.c +++ b/2d/canvas.c @@ -11,7 +11,10 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +#ifdef HAVE_CONFIG_H #include +#endif + #include //#include #include diff --git a/2d/circle.c b/2d/circle.c index 4d25a70b..42b7ff23 100644 --- a/2d/circle.c +++ b/2d/circle.c @@ -11,11 +11,14 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: circle.c,v 1.1.1.1 2001-01-19 03:29:57 bradleyb Exp $"; +static char rcsid[] = "$Id: circle.c,v 1.2 2001-01-31 15:17:47 bradleyb Exp $"; #endif -#include #include "u_mem.h" #include "gr.h" diff --git a/2d/disc.c b/2d/disc.c index 9a280c01..a8582ad4 100644 --- a/2d/disc.c +++ b/2d/disc.c @@ -11,7 +11,10 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +#ifdef HAVE_CONFIG_H #include +#endif + #include "u_mem.h" #include "gr.h" diff --git a/2d/font.c b/2d/font.c index 96711545..7ca67717 100644 --- a/2d/font.c +++ b/2d/font.c @@ -11,7 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/2d/gpixel.c b/2d/gpixel.c index d1e0b686..d2389c81 100644 --- a/2d/gpixel.c +++ b/2d/gpixel.c @@ -11,7 +11,10 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +#ifdef HAVE_CONFIG_H #include +#endif + #include "u_mem.h" #include "gr.h" diff --git a/2d/ibitblt.c b/2d/ibitblt.c index e858570d..3d7099a6 100644 --- a/2d/ibitblt.c +++ b/2d/ibitblt.c @@ -17,7 +17,9 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H #include +#endif #include #include "pstypes.h" diff --git a/2d/line.c b/2d/line.c index b9f34f63..5b0fd553 100644 --- a/2d/line.c +++ b/2d/line.c @@ -15,7 +15,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include "u_mem.h" diff --git a/2d/palette.c b/2d/palette.c index be6f427a..bf9e7773 100644 --- a/2d/palette.c +++ b/2d/palette.c @@ -15,7 +15,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include diff --git a/2d/pcx.c b/2d/pcx.c index d6dbc630..44fbf5de 100644 --- a/2d/pcx.c +++ b/2d/pcx.c @@ -16,7 +16,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/2d/pixel.c b/2d/pixel.c index a0c9951b..6bb05bf0 100644 --- a/2d/pixel.c +++ b/2d/pixel.c @@ -16,7 +16,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H #include +#endif + #include "u_mem.h" #include "gr.h" diff --git a/2d/poly.c b/2d/poly.c index 62bd27b1..693fd782 100644 --- a/2d/poly.c +++ b/2d/poly.c @@ -16,7 +16,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H #include +#endif + #include "u_mem.h" #include "gr.h" #include "grdef.h" diff --git a/2d/rect.c b/2d/rect.c index 60576b7d..716f6a86 100644 --- a/2d/rect.c +++ b/2d/rect.c @@ -16,7 +16,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H #include +#endif + #include "u_mem.h" #include "gr.h" diff --git a/2d/rle.c b/2d/rle.c index 02a82dbf..26fee949 100644 --- a/2d/rle.c +++ b/2d/rle.c @@ -14,11 +14,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: rle.c,v 1.1.1.1 2001-01-19 03:29:57 bradleyb Exp $"; +static char rcsid[] = "$Id: rle.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/2d/scale.c b/2d/scale.c index 1cf5fde6..7864834a 100644 --- a/2d/scale.c +++ b/2d/scale.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/2d/scale.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:57 $ + * $Date: 2001-01-31 15:17:48 $ * * Routines for scaling a bitmap. * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:57 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.1.1.1 1999/06/14 21:57:36 donut * Import of d1x 1.37 source. * @@ -64,12 +67,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: scale.c,v 1.1.1.1 2001-01-19 03:29:57 bradleyb Exp $"; +static char rcsid[] = "$Id: scale.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/2d/scalec.c b/2d/scalec.c index c68f6a05..e31a7c74 100644 --- a/2d/scalec.c +++ b/2d/scalec.c @@ -10,7 +10,11 @@ CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ + +#ifdef HAVE_CONFIG_H #include +#endif + #include #include "gr.h" #include "grdef.h" diff --git a/2d/tmerge.c b/2d/tmerge.c index 2364379d..5d7362f6 100644 --- a/2d/tmerge.c +++ b/2d/tmerge.c @@ -1,8 +1,9 @@ // tmerge.c - C Texture merge routines for use with D1X // Ripped from ldescent by +#ifdef HAVE_CONFIG_H #include -#ifdef NO_ASM // If for some reason we have elected not to use assembler... +#endif #include "gr.h" @@ -56,6 +57,3 @@ void gr_merge_textures_3( ubyte * lower, ubyte * upper, ubyte * dest ) *dest++ = c; } } - - -#endif diff --git a/3d/clipper.c b/3d/clipper.c index 9d1cdcdc..462d4bfd 100644 --- a/3d/clipper.c +++ b/3d/clipper.c @@ -10,7 +10,11 @@ CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ + +#ifdef HAVE_CONFIG_H #include +#endif + #include "fix.h" #include "vecmat.h" #include "gr.h" diff --git a/3d/draw.c b/3d/draw.c index 9ce9c058..a5ba9efa 100644 --- a/3d/draw.c +++ b/3d/draw.c @@ -16,11 +16,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: draw.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $"; +static char rcsid[] = "$Id: draw.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include "error.h" #include "fix.h" diff --git a/3d/globvars.c b/3d/globvars.c index b31aae71..d4e7c81d 100644 --- a/3d/globvars.c +++ b/3d/globvars.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/3d/globvars.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:58 $ + * $Date: 2001-01-31 15:17:48 $ * * Global variables for 3d * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:58 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.1.1.1 1999/06/14 21:57:45 donut * Import of d1x 1.37 source. * @@ -34,11 +37,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: globvars.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $"; +static char rcsid[] = "$Id: globvars.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include "fix.h" #include "vecmat.h" #include "gr.h" diff --git a/3d/instance.c b/3d/instance.c index 1e66feae..51cadfb1 100644 --- a/3d/instance.c +++ b/3d/instance.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/3d/instance.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:58 $ + * $Date: 2001-01-31 15:17:48 $ * * Instancing routines * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:58 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.1.1.1 1999/06/14 21:57:45 donut * Import of d1x 1.37 source. * @@ -34,11 +37,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: instance.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $"; +static char rcsid[] = "$Id: instance.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include #include "error.h" diff --git a/3d/interp.c b/3d/interp.c index 9f0899bd..8d269636 100644 --- a/3d/interp.c +++ b/3d/interp.c @@ -8,17 +8,20 @@ SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERV +COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/3d/interp.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:58 $ + * $Date: 2001-01-31 15:17:48 $ * * Polygon object interpreter * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:58 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.1.1.1 1999/06/14 21:57:47 donut * Import of d1x 1.37 source. * @@ -40,11 +43,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERV * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: interp.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $"; +static char rcsid[] = "$Id: interp.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include #include "fix.h" diff --git a/3d/matrix.c b/3d/matrix.c index e9301b5b..b7401536 100644 --- a/3d/matrix.c +++ b/3d/matrix.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/3d/matrix.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:58 $ + * $Date: 2001-01-31 15:17:48 $ * * Matrix setup & manipulation routines * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:58 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.1.1.1 1999/06/14 21:57:48 donut * Import of d1x 1.37 source. * @@ -31,12 +34,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: matrix.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $"; +static char rcsid[] = "$Id: matrix.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include "fix.h" #include "vecmat.h" #include "gr.h" diff --git a/3d/points.c b/3d/points.c index 65473707..f61d4d3b 100644 --- a/3d/points.c +++ b/3d/points.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/3d/points.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:58 $ + * $Date: 2001-01-31 15:17:48 $ * * Routines for point definition, rotation, etc. * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:58 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.1.1.1 1999/06/14 21:57:49 donut * Import of d1x 1.37 source. * @@ -37,12 +40,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ -#ifdef RCS -static char rcsid[] = "$Id: points.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $"; +#ifdef HAVE_CONFIG_H +#include #endif +#ifdef RCS +static char rcsid[] = "$Id: points.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; +#endif -#include #include "fix.h" #include "vecmat.h" #include "gr.h" diff --git a/3d/rod.c b/3d/rod.c index 9f5e9d8d..967452a6 100644 --- a/3d/rod.c +++ b/3d/rod.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/3d/rod.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:58 $ + * $Date: 2001-01-31 15:17:48 $ * * Rod routines * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:58 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.2 1999/09/21 04:05:55 donut * mostly complete OGL implementation (still needs bitmap handling (reticle), and door/fan textures are corrupt) * @@ -37,11 +40,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: rod.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $"; +static char rcsid[] = "$Id: rod.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include "fix.h" #include "vecmat.h" #include "gr.h" diff --git a/3d/setup.c b/3d/setup.c index 37ed8abc..d0ae5a2e 100644 --- a/3d/setup.c +++ b/3d/setup.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/3d/setup.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:58 $ + * $Date: 2001-01-31 15:17:48 $ * * Setup for 3d library * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:58 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.3 1999/10/07 02:27:14 donut * OGL includes to remove warnings * @@ -46,12 +49,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: setup.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $"; +static char rcsid[] = "$Id: setup.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include #include "error.h" diff --git a/arch/Makefile.am b/arch/Makefile.am index 65faac13..a64d9555 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -7,8 +7,13 @@ if ENV_DJGPP libarch_a_SOURCES = dos_init.c dos_vesa.c dos_findfile.c dos_dpmi.c dos_ipx.c else if USE_NETWORK +if ENV_CYGWIN +libarch_a_SOURCES = linux_init.c win32_findfile.c sdl_init.c sdl_timer.c + linux_ipx_bsd.c linux_ipx_lin.c linux_ipx_udp.c linux_net.c +else libarch_a_SOURCES = linux_init.c linux_findfile.c sdl_init.c sdl_timer.c \ linux_ipx_bsd.c linux_ipx_lin.c linux_ipx_udp.c linux_net.c +endif else if ENV_CYGWIN libarch_a_SOURCES = linux_init.c win32_findfile.c sdl_init.c sdl_timer.c diff --git a/cfile/cfile.c b/cfile/cfile.c index 3f59cf34..99df140f 100644 --- a/cfile/cfile.c +++ b/cfile/cfile.c @@ -11,7 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include diff --git a/iff/iff.c b/iff/iff.c index 656c2dbd..1169b2d2 100644 --- a/iff/iff.c +++ b/iff/iff.c @@ -11,11 +11,13 @@ 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 RCS -static char rcsid[] = "$Id: iff.c,v 1.3 2001-01-22 13:37:46 bradleyb Exp $"; +#ifdef HAVE_CONFIG_H +#include #endif -#include +#ifdef RCS +static char rcsid[] = "$Id: iff.c,v 1.4 2001-01-31 15:17:48 bradleyb Exp $"; +#endif #define COMPRESS 1 //do the RLE or not? (for debugging mostly) #define WRITE_TINY 0 //should we write a TINY chunk? diff --git a/main/ai.c b/main/ai.c index 2dc8739e..47365a37 100644 --- a/main/ai.c +++ b/main/ai.c @@ -12,9 +12,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ -char ai_rcsid[] = "$Id: ai.c,v 1.1.1.1 2001-01-19 03:30:02 bradleyb Exp $"; - +#ifdef HAVE_CONFIG_H #include +#endif + +char ai_rcsid[] = "$Id: ai.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; + #include #include #include diff --git a/main/ai2.c b/main/ai2.c index 9f381c84..a55a1bee 100644 --- a/main/ai2.c +++ b/main/ai2.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: ai2.c,v 1.1.1.1 2001-01-19 03:30:01 bradleyb Exp $"; +static char rcsid[] = "$Id: ai2.c,v 1.2 2001-01-31 15:17:48 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/main/aipath.c b/main/aipath.c index 6aa355aa..957c669a 100644 --- a/main/aipath.c +++ b/main/aipath.c @@ -11,7 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include // for printf() #include // for rand() and qsort() #include // for memset() diff --git a/main/automap.c b/main/automap.c index 1142dcb8..8382582e 100644 --- a/main/automap.c +++ b/main/automap.c @@ -11,8 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/main/bm.c b/main/bm.c index ed312056..f432b0a1 100644 --- a/main/bm.c +++ b/main/bm.c @@ -11,11 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: bm.c,v 1.2 2001-01-20 13:49:14 bradleyb Exp $"; +static char rcsid[] = "$Id: bm.c,v 1.3 2001-01-31 15:17:49 bradleyb Exp $"; #endif -#include #include #include diff --git a/main/bmread.c b/main/bmread.c index 60885268..d3863409 100644 --- a/main/bmread.c +++ b/main/bmread.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -char bmread_rcsid[] = "$Id: bmread.c,v 1.1.1.1 2001-01-19 03:30:01 bradleyb Exp $"; +char bmread_rcsid[] = "$Id: bmread.c,v 1.2 2001-01-31 15:17:49 bradleyb Exp $"; #endif -#include - #ifdef EDITOR diff --git a/main/cmd.c b/main/cmd.c index ac0e77ef..14f9698e 100644 --- a/main/cmd.c +++ b/main/cmd.c @@ -1,4 +1,7 @@ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/main/cntrlcen.c b/main/cntrlcen.c index 09fe806b..73f0512e 100644 --- a/main/cntrlcen.c +++ b/main/cntrlcen.c @@ -11,15 +11,18 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: cntrlcen.c,v 1.1.1.1 2001-01-19 03:29:59 bradleyb Exp $"; +static char rcsid[] = "$Id: cntrlcen.c,v 1.2 2001-01-31 15:17:49 bradleyb Exp $"; #endif #ifdef WINDOWS #include "desw.h" #endif -#include #include #include #include diff --git a/main/collide.c b/main/collide.c index 392d6734..1aab1ceb 100644 --- a/main/collide.c +++ b/main/collide.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: collide.c,v 1.3 2001-01-31 14:04:44 bradleyb Exp $"; +static char rcsid[] = "$Id: collide.c,v 1.4 2001-01-31 15:17:49 bradleyb Exp $"; #endif -#include #include // for memset #include #include diff --git a/main/config.c b/main/config.c index 5e2dd00b..1054e533 100644 --- a/main/config.c +++ b/main/config.c @@ -11,7 +11,9 @@ 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 HAVE_CONFIG_H #include +#endif #ifndef MACINTOSH // I'm going to totally seperate these routines -- yeeech!!!! // see end of file for macintosh equivs @@ -46,7 +48,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef RCS -static char rcsid[] = "$Id: config.c,v 1.2 2001-01-24 04:29:45 bradleyb Exp $"; +static char rcsid[] = "$Id: config.c,v 1.3 2001-01-31 15:17:49 bradleyb Exp $"; #endif ubyte Config_digi_volume = 8; @@ -576,7 +578,7 @@ int WriteConfigFile() #endif #ifdef RCS -static char rcsid[] = "$Id: config.c,v 1.2 2001-01-24 04:29:45 bradleyb Exp $"; +static char rcsid[] = "$Id: config.c,v 1.3 2001-01-31 15:17:49 bradleyb Exp $"; #endif #define MAX_CTB_LEN 512 diff --git a/main/console.c b/main/console.c index d92e37ee..17f529e7 100644 --- a/main/console.c +++ b/main/console.c @@ -1,4 +1,7 @@ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/main/controls.c b/main/controls.c index 535466ec..0765a5c6 100644 --- a/main/controls.c +++ b/main/controls.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: controls.c,v 1.1.1.1 2001-01-19 03:30:01 bradleyb Exp $"; +static char rcsid[] = "$Id: controls.c,v 1.2 2001-01-31 15:17:49 bradleyb Exp $"; #endif -#include #include #include diff --git a/main/credits.c b/main/credits.c index b8a8fd31..5e218b52 100644 --- a/main/credits.c +++ b/main/credits.c @@ -11,16 +11,18 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: credits.c,v 1.2 2001-01-20 13:49:14 bradleyb Exp $"; +static char rcsid[] = "$Id: credits.c,v 1.3 2001-01-31 15:17:50 bradleyb Exp $"; #endif #ifdef WINDOWS #include "desw.h" #endif -#include #include #include #include diff --git a/main/crypt.c b/main/crypt.c index 0a94416d..7a72842c 100644 --- a/main/crypt.c +++ b/main/crypt.c @@ -11,11 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -char crypt_rcsid[] = "$Id: crypt.c,v 1.1.1.1 2001-01-19 03:30:01 bradleyb Exp $"; +char crypt_rcsid[] = "$Id: crypt.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/main/dumpmine.c b/main/dumpmine.c index 7d89be52..2c3fd51a 100644 --- a/main/dumpmine.c +++ b/main/dumpmine.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: dumpmine.c,v 1.1.1.1 2001-01-19 03:30:00 bradleyb Exp $"; +static char rcsid[] = "$Id: dumpmine.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/main/effects.c b/main/effects.c index f4dbd463..6406b458 100644 --- a/main/effects.c +++ b/main/effects.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: effects.c,v 1.1.1.1 2001-01-19 03:30:00 bradleyb Exp $"; +static char rcsid[] = "$Id: effects.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/main/endlevel.c b/main/endlevel.c index 9a15b2b5..d47e9e46 100644 --- a/main/endlevel.c +++ b/main/endlevel.c @@ -11,11 +11,13 @@ 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 RCS -static char rcsid[] = "$Id: endlevel.c,v 1.1.1.1 2001-01-19 03:30:01 bradleyb Exp $"; +#ifdef HAVE_CONFIG_H +#include #endif -#include +#ifdef RCS +static char rcsid[] = "$Id: endlevel.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $"; +#endif //#define SLEW_ON 1 diff --git a/main/escort.c b/main/escort.c index 9c1fe75b..c856f601 100644 --- a/main/escort.c +++ b/main/escort.c @@ -11,8 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include // for printf() #include // for rand() and qsort() #include // for memset() diff --git a/main/fireball.c b/main/fireball.c index 9ee26483..fe95467a 100644 --- a/main/fireball.c +++ b/main/fireball.c @@ -11,8 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/main/fuelcen.c b/main/fuelcen.c index 0cb64ca0..20318ef9 100644 --- a/main/fuelcen.c +++ b/main/fuelcen.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: fuelcen.c,v 1.1.1.1 2001-01-19 03:29:59 bradleyb Exp $"; +static char rcsid[] = "$Id: fuelcen.c,v 1.2 2001-01-31 15:17:50 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/main/fvi.c b/main/fvi.c index c76e766f..71f1ad43 100644 --- a/main/fvi.c +++ b/main/fvi.c @@ -14,8 +14,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/main/game.c b/main/game.c index f8f4ff5f..03f38907 100644 --- a/main/game.c +++ b/main/game.c @@ -11,15 +11,18 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -char game_rcsid[] = "$Id: game.c,v 1.5 2001-01-28 05:53:04 bradleyb Exp $"; +char game_rcsid[] = "$Id: game.c,v 1.6 2001-01-31 15:17:50 bradleyb Exp $"; #endif #ifdef WINDOWS #include "desw.h" #endif -#include #include #include #include diff --git a/main/gamecntl.c b/main/gamecntl.c index 10e2df28..ec837e95 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -13,8 +13,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/main/gamefont.c b/main/gamefont.c index 68923d72..3f4eac03 100644 --- a/main/gamefont.c +++ b/main/gamefont.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: gamefont.c,v 1.1.1.1 2001-01-19 03:30:04 bradleyb Exp $"; +static char rcsid[] = "$Id: gamefont.c,v 1.2 2001-01-31 15:17:52 bradleyb Exp $"; #endif -#include #include #include "inferno.h" diff --git a/main/gamemine.c b/main/gamemine.c index 5f05d7b6..7800f096 100644 --- a/main/gamemine.c +++ b/main/gamemine.c @@ -11,11 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: gamemine.c,v 1.1.1.1 2001-01-19 03:30:01 bradleyb Exp $"; +static char rcsid[] = "$Id: gamemine.c,v 1.2 2001-01-31 15:17:52 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/main/gamepal.c b/main/gamepal.c index 203a8716..88b855a4 100644 --- a/main/gamepal.c +++ b/main/gamepal.c @@ -11,8 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/main/gamerend.c b/main/gamerend.c index 9983a1ea..32a2ac04 100644 --- a/main/gamerend.c +++ b/main/gamerend.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: gamerend.c,v 1.3 2001-01-22 15:49:15 bradleyb Exp $"; +static char rcsid[] = "$Id: gamerend.c,v 1.4 2001-01-31 15:17:52 bradleyb Exp $"; #endif - -#include #ifdef WINDOWS #include "desw.h" #include "winapp.h" diff --git a/main/gamesave.c b/main/gamesave.c index 1c4c77a9..2d45459a 100644 --- a/main/gamesave.c +++ b/main/gamesave.c @@ -11,11 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -char gamesave_rcsid[] = "$Id: gamesave.c,v 1.3 2001-01-31 14:04:44 bradleyb Exp $"; +char gamesave_rcsid[] = "$Id: gamesave.c,v 1.4 2001-01-31 15:17:53 bradleyb Exp $"; #endif -#include #include #include diff --git a/main/gameseg.c b/main/gameseg.c index 8e0d5e74..1bdcd23e 100644 --- a/main/gameseg.c +++ b/main/gameseg.c @@ -11,8 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include #include // for memset() @@ -31,7 +33,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "byteswap.h" #ifdef RCS -static char rcsid[] = "$Id: gameseg.c,v 1.2 2001-01-20 13:49:15 bradleyb Exp $"; +static char rcsid[] = "$Id: gameseg.c,v 1.3 2001-01-31 15:17:53 bradleyb Exp $"; #endif // How far a point can be from a plane, and still be "in" the plane diff --git a/main/gameseq.c b/main/gameseq.c index b9d33001..7a5b8c1d 100644 --- a/main/gameseq.c +++ b/main/gameseq.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -char gameseq_rcsid[] = "$Id: gameseq.c,v 1.3 2001-01-31 14:04:44 bradleyb Exp $"; +char gameseq_rcsid[] = "$Id: gameseq.c,v 1.4 2001-01-31 15:17:53 bradleyb Exp $"; #endif -#include #ifdef WINDOWS #include "desw.h" #endif diff --git a/main/hostage.c b/main/hostage.c index 307add92..e2c66b5f 100644 --- a/main/hostage.c +++ b/main/hostage.c @@ -11,11 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: hostage.c,v 1.1.1.1 2001-01-19 03:29:59 bradleyb Exp $"; +static char rcsid[] = "$Id: hostage.c,v 1.2 2001-01-31 15:17:53 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/main/kconfig.c b/main/kconfig.c index d6664eb9..76782159 100644 --- a/main/kconfig.c +++ b/main/kconfig.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: kconfig.c,v 1.6 2001-01-31 13:56:54 bradleyb Exp $"; +static char rcsid[] = "$Id: kconfig.c,v 1.7 2001-01-31 15:17:53 bradleyb Exp $"; #endif -#include - #ifdef WINDOWS #include "desw.h" #endif diff --git a/main/kmatrix.c b/main/kmatrix.c index eb1abfa4..085ecbe9 100644 --- a/main/kmatrix.c +++ b/main/kmatrix.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: kmatrix.c,v 1.2 2001-01-20 13:49:16 bradleyb Exp $"; +static char rcsid[] = "$Id: kmatrix.c,v 1.3 2001-01-31 15:17:54 bradleyb Exp $"; #endif -#include - #ifdef NETWORK #ifdef WINDOWS diff --git a/main/laser.c b/main/laser.c index 5dd1a64c..2bdbb18b 100644 --- a/main/laser.c +++ b/main/laser.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -char laser_rcsid[] = "$Id: laser.c,v 1.2 2001-01-20 13:49:16 bradleyb Exp $"; +char laser_rcsid[] = "$Id: laser.c,v 1.3 2001-01-31 15:17:54 bradleyb Exp $"; #endif -#include - #include #include diff --git a/main/lighting.c b/main/lighting.c index 6a4a2a52..b787da66 100644 --- a/main/lighting.c +++ b/main/lighting.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: lighting.c,v 1.2 2001-01-22 13:22:39 bradleyb Exp $"; +static char rcsid[] = "$Id: lighting.c,v 1.3 2001-01-31 15:17:54 bradleyb Exp $"; #endif -#include #include #include // for memset() diff --git a/main/mglobal.c b/main/mglobal.c index 7ddb34d5..eb68133e 100644 --- a/main/mglobal.c +++ b/main/mglobal.c @@ -11,11 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: mglobal.c,v 1.1.1.1 2001-01-19 03:29:59 bradleyb Exp $"; +static char rcsid[] = "$Id: mglobal.c,v 1.2 2001-01-31 15:17:54 bradleyb Exp $"; #endif -#include #include "fix.h" #include "vecmat.h" #include "inferno.h" diff --git a/main/mission.c b/main/mission.c index fae1d04c..536851c3 100644 --- a/main/mission.c +++ b/main/mission.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: mission.c,v 1.1.1.1 2001-01-19 03:30:05 bradleyb Exp $"; +static char rcsid[] = "$Id: mission.c,v 1.2 2001-01-31 15:17:54 bradleyb Exp $"; #endif -#include - #include #include #include diff --git a/main/morph.c b/main/morph.c index 8edfedfb..b94689ea 100644 --- a/main/morph.c +++ b/main/morph.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: morph.c,v 1.1.1.1 2001-01-19 03:30:02 bradleyb Exp $"; +static char rcsid[] = "$Id: morph.c,v 1.2 2001-01-31 15:17:54 bradleyb Exp $"; #endif -#include - #include #include #include diff --git a/main/netmisc.c b/main/netmisc.c index c2d835f6..9440e976 100644 --- a/main/netmisc.c +++ b/main/netmisc.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: netmisc.c,v 1.1.1.1 2001-01-19 03:30:01 bradleyb Exp $"; +static char rcsid[] = "$Id: netmisc.c,v 1.2 2001-01-31 15:17:54 bradleyb Exp $"; #endif -#include - #include #include diff --git a/main/network.c b/main/network.c index 1d047833..63b0d482 100644 --- a/main/network.c +++ b/main/network.c @@ -11,11 +11,13 @@ 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 RCS -static char rcsid[] = "$Id: network.c,v 1.3 2001-01-24 04:29:45 bradleyb Exp $"; +#ifdef HAVE_CONFIG_H +#include #endif -#include +#ifdef RCS +static char rcsid[] = "$Id: network.c,v 1.4 2001-01-31 15:17:54 bradleyb Exp $"; +#endif #ifdef NETWORK diff --git a/main/newdemo.c b/main/newdemo.c index 4ea81980..1ef68a9b 100644 --- a/main/newdemo.c +++ b/main/newdemo.c @@ -11,8 +11,9 @@ 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 HAVE_CONFIG_H #include +#endif #include #include diff --git a/main/newmenu.c b/main/newmenu.c index b6fe2d37..3b6f4253 100644 --- a/main/newmenu.c +++ b/main/newmenu.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: newmenu.c,v 1.2 2001-01-20 13:49:16 bradleyb Exp $"; +static char rcsid[] = "$Id: newmenu.c,v 1.3 2001-01-31 15:17:56 bradleyb Exp $"; #endif -#include - #ifdef WINDOWS #include "desw.h" #endif diff --git a/main/object.c b/main/object.c index dff1c962..89e45dd1 100644 --- a/main/object.c +++ b/main/object.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: object.c,v 1.4 2001-01-31 14:04:45 bradleyb Exp $"; +static char rcsid[] = "$Id: object.c,v 1.5 2001-01-31 15:17:56 bradleyb Exp $"; #endif -#include - #ifdef WINDOWS #include "desw.h" #endif diff --git a/main/paging.c b/main/paging.c index 8ad7bf84..328293f1 100644 --- a/main/paging.c +++ b/main/paging.c @@ -13,13 +13,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: paging.c,v 1.1.1.1 2001-01-19 03:29:59 bradleyb Exp $"; +static char rcsid[] = "$Id: paging.c,v 1.2 2001-01-31 15:17:57 bradleyb Exp $"; #endif -#include - #ifdef WINDOWS #include "desw.h" #endif diff --git a/main/physics.c b/main/physics.c index ed2b79d2..9d6cda3a 100644 --- a/main/physics.c +++ b/main/physics.c @@ -11,11 +11,13 @@ 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 RCS -static char rcsid[] = "$Id: physics.c,v 1.2 2001-01-20 13:49:17 bradleyb Exp $"; +#ifdef HAVE_CONFIG_H +#include #endif -#include +#ifdef RCS +static char rcsid[] = "$Id: physics.c,v 1.3 2001-01-31 15:17:57 bradleyb Exp $"; +#endif #include #include diff --git a/main/piggy.c b/main/piggy.c index f8839310..41fef2d0 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: piggy.c,v 1.3 2001-01-24 04:29:48 bradleyb Exp $"; +static char rcsid[] = "$Id: piggy.c,v 1.4 2001-01-31 15:17:57 bradleyb Exp $"; #endif -#include #include #include diff --git a/main/polyobj.c b/main/polyobj.c index 26cc293c..9ad551b5 100644 --- a/main/polyobj.c +++ b/main/polyobj.c @@ -9,15 +9,16 @@ FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: polyobj.c,v 1.3 2001-01-24 04:29:48 bradleyb Exp $"; +static char rcsid[] = "$Id: polyobj.c,v 1.4 2001-01-31 15:17:57 bradleyb Exp $"; #endif -#include - #include #include #include diff --git a/main/powerup.c b/main/powerup.c index 97efa5c3..03a2b5d9 100644 --- a/main/powerup.c +++ b/main/powerup.c @@ -11,8 +11,9 @@ 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 HAVE_CONFIG_H #include +#endif #include #include diff --git a/main/render.c b/main/render.c index 7833e66d..4aed06f0 100644 --- a/main/render.c +++ b/main/render.c @@ -11,11 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: render.c,v 1.3 2001-01-31 14:04:45 bradleyb Exp $"; +static char rcsid[] = "$Id: render.c,v 1.4 2001-01-31 15:17:57 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/main/robot.c b/main/robot.c index f6c8b4cb..8c662f62 100644 --- a/main/robot.c +++ b/main/robot.c @@ -11,8 +11,9 @@ 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 HAVE_CONFIG_H #include +#endif #include diff --git a/main/slew.c b/main/slew.c index e6eafe16..d69965d5 100644 --- a/main/slew.c +++ b/main/slew.c @@ -11,11 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: slew.c,v 1.2 2001-01-24 04:29:48 bradleyb Exp $"; +static char rcsid[] = "$Id: slew.c,v 1.3 2001-01-31 15:17:57 bradleyb Exp $"; #endif -#include #include #include "inferno.h" diff --git a/main/songs.c b/main/songs.c index be9da25f..0e700acf 100644 --- a/main/songs.c +++ b/main/songs.c @@ -11,8 +11,9 @@ 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 HAVE_CONFIG_H #include +#endif #include #include diff --git a/main/switch.c b/main/switch.c index 349c9726..18647a24 100644 --- a/main/switch.c +++ b/main/switch.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: switch.c,v 1.2 2001-01-20 13:49:18 bradleyb Exp $"; +static char rcsid[] = "$Id: switch.c,v 1.3 2001-01-31 15:17:57 bradleyb Exp $"; #endif -#include - #include #include #include diff --git a/main/texmerge.c b/main/texmerge.c index 1a99cd01..17a2be53 100644 --- a/main/texmerge.c +++ b/main/texmerge.c @@ -11,7 +11,9 @@ 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 HAVE_CONFIG_H #include +#endif #include diff --git a/main/text.c b/main/text.c index 9eaf3796..aac91b5f 100644 --- a/main/text.c +++ b/main/text.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: text.c,v 1.2 2001-01-24 04:42:21 bradleyb Exp $"; +static char rcsid[] = "$Id: text.c,v 1.3 2001-01-31 15:17:59 bradleyb Exp $"; #endif -#include - #include #include #include diff --git a/main/titles.c b/main/titles.c index 60c6d658..66edeabe 100644 --- a/main/titles.c +++ b/main/titles.c @@ -11,7 +11,9 @@ 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 HAVE_CONFIG_H #include +#endif #ifdef WINDOWS #include "desw.h" diff --git a/main/vclip.c b/main/vclip.c index c80ea53d..2e96b691 100644 --- a/main/vclip.c +++ b/main/vclip.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: vclip.c,v 1.1.1.1 2001-01-19 03:29:59 bradleyb Exp $"; +static char rcsid[] = "$Id: vclip.c,v 1.2 2001-01-31 15:17:59 bradleyb Exp $"; #endif -#include - #include #include "error.h" diff --git a/main/wall.c b/main/wall.c index 1d6bccf1..64814aee 100644 --- a/main/wall.c +++ b/main/wall.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: wall.c,v 1.2 2001-01-20 13:49:18 bradleyb Exp $"; +static char rcsid[] = "$Id: wall.c,v 1.3 2001-01-31 15:17:59 bradleyb Exp $"; #endif -#include - #include #include #include diff --git a/main/weapon.c b/main/weapon.c index f612334d..ee5e7892 100644 --- a/main/weapon.c +++ b/main/weapon.c @@ -11,13 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: weapon.c,v 1.1.1.1 2001-01-19 03:29:59 bradleyb Exp $"; +static char rcsid[] = "$Id: weapon.c,v 1.2 2001-01-31 15:17:59 bradleyb Exp $"; #endif -#include - #include #include #include diff --git a/maths/Makefile.am b/maths/Makefile.am index f1b41b40..983e2f0b 100644 --- a/maths/Makefile.am +++ b/maths/Makefile.am @@ -1,7 +1,11 @@ noinst_LIBRARIES = libmaths.a INCLUDES = -I $(top_srcdir)/includes +if USE_ASM +libmaths_a_SOURCES = vecmat.c rand.c tables.c +else libmaths_a_SOURCES = vecmat.c rand.c tables.c fixc.c +endif SUFFIXES = .asm %.o: %.asm diff --git a/maths/fixc.c b/maths/fixc.c index 1380a2b5..5c472ca0 100644 --- a/maths/fixc.c +++ b/maths/fixc.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/maths/fixc.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:58 $ + * $Date: 2001-01-31 15:18:04 $ * * C version of fixed point library * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:58 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.3 1999/10/18 00:31:01 donut * more alpha fixes from Falk Hueffner * @@ -58,21 +61,21 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: fixc.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $"; +static char rcsid[] = "$Id: fixc.c,v 1.2 2001-01-31 15:18:04 bradleyb Exp $"; #endif -#include -#include "maths.h" - -#ifdef NO_ASM #include #include #include "error.h" #include "maths.h" +#ifndef NO_ASM #ifdef NO_FIX_INLINE #ifdef _MSC_VER #pragma message ("warning: FIX NOT INLINED") @@ -80,6 +83,7 @@ static char rcsid[] = "$Id: fixc.c,v 1.1.1.1 2001-01-19 03:29:58 bradleyb Exp $" #warning "FIX NOT INLINED" #endif #endif +#endif extern ubyte guess_table[]; extern short sincos_table[]; @@ -555,4 +559,3 @@ fix fix_isqrt( fix a ) return r; } -#endif // NO_ASM diff --git a/maths/rand.c b/maths/rand.c index 899980a1..69a0b562 100644 --- a/maths/rand.c +++ b/maths/rand.c @@ -1,7 +1,10 @@ // Descent random number stuff... // rand has different ranges on different machines... +#ifdef HAVE_CONFIG_H #include +#endif + #include #ifdef NO_WATCOM_RAND diff --git a/maths/tables.c b/maths/tables.c index 03a1e49b..b278adc6 100644 --- a/maths/tables.c +++ b/maths/tables.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/maths/tables.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:29:58 $ + * $Date: 2001-01-31 15:18:04 $ * * C version of fixed point library * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:29:58 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.1.1.1 1999/06/14 22:13:38 donut * Import of d1x 1.37 source. * @@ -30,7 +33,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H #include +#endif + #include "maths.h" ubyte guess_table[] = { diff --git a/maths/vecmat.c b/maths/vecmat.c index 980c28c2..592c4578 100644 --- a/maths/vecmat.c +++ b/maths/vecmat.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/maths/vecmat.c,v $ - * $Revision: 1.1.1.2 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:33:42 $ + * $Date: 2001-01-31 15:18:04 $ * * C version of vecmat library * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.2 2001/01/19 03:33:42 bradleyb + * Import of d2x-0.0.9-pre1 + * * Revision 1.1.1.1 1999/06/14 22:13:42 donut * Import of d1x 1.37 source. * @@ -46,11 +49,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: vecmat.c,v 1.1.1.2 2001-01-19 03:33:42 bradleyb Exp $"; +static char rcsid[] = "$Id: vecmat.c,v 1.2 2001-01-31 15:18:04 bradleyb Exp $"; #endif -#include #include #include // for sqrt diff --git a/mem/mem.c b/mem/mem.c index cfaadc79..cb153d7a 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -11,12 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: mem.c,v 1.2 2001-01-31 14:04:45 bradleyb Exp $"; +static char rcsid[] = "$Id: mem.c,v 1.3 2001-01-31 15:18:04 bradleyb Exp $"; #endif - // Warning( "MEM: Too many malloc's!" ); // Warning( "MEM: Malloc returnd an already alloced block!" ); // Warning( "MEM: Malloc Failed!" ); diff --git a/misc/args.c b/misc/args.c index 55e1ca73..fe031943 100644 --- a/misc/args.c +++ b/misc/args.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/misc/args.c,v $ - * $Revision: 1.2 $ + * $Revision: 1.3 $ * $Author: bradleyb $ - * $Date: 2001-01-24 04:29:48 $ + * $Date: 2001-01-31 15:18:04 $ * * Functions for accessing arguments. * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/24 04:29:48 bradleyb + * changed args_find to FindArg + * * Revision 1.1.1.1 2001/01/19 03:30:14 bradleyb * Import of d2x-0.0.8 * @@ -67,12 +70,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: args.c,v 1.2 2001-01-24 04:29:48 bradleyb Exp $"; +static char rcsid[] = "$Id: args.c,v 1.3 2001-01-31 15:18:04 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/misc/byteswap.c b/misc/byteswap.c index adad0d51..8cc69e95 100644 --- a/misc/byteswap.c +++ b/misc/byteswap.c @@ -11,7 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include diff --git a/misc/d_delay.c b/misc/d_delay.c index a2d6f5c2..35b30f59 100644 --- a/misc/d_delay.c +++ b/misc/d_delay.c @@ -1,5 +1,9 @@ //added on 9/2/98 by Matt Mueller + +#ifdef HAVE_CONFIG_H #include +#endif + #include "d_delay.h" #ifndef d_delay diff --git a/misc/d_glob.c b/misc/d_glob.c index 1c619b71..5e1f0ba6 100644 --- a/misc/d_glob.c +++ b/misc/d_glob.c @@ -1,5 +1,9 @@ /* Globbing functions for descent. Calls the relevant system handlers... */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "d_glob.h" #include "error.h" #include diff --git a/misc/d_io.c b/misc/d_io.c index 1e7ab075..a68f9758 100644 --- a/misc/d_io.c +++ b/misc/d_io.c @@ -1,6 +1,10 @@ // some misc. file/disk routines // Arne de Bruijn, 1998 + +#ifdef HAVE_CONFIG_H #include +#endif + #include #include #include "d_io.h" diff --git a/misc/error.c b/misc/error.c index fdf6f277..33336c2f 100644 --- a/misc/error.c +++ b/misc/error.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/misc/error.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:30:14 $ + * $Date: 2001-01-31 15:18:04 $ * * Error handling/printing/exiting code * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:30:14 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.1.1.1 1999/06/14 22:13:48 donut * Import of d1x 1.37 source. * @@ -62,11 +65,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: error.c,v 1.1.1.1 2001-01-19 03:30:14 bradleyb Exp $"; +static char rcsid[] = "$Id: error.c,v 1.2 2001-01-31 15:18:04 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/misc/hash.c b/misc/hash.c index de4eecba..1608a1aa 100644 --- a/misc/hash.c +++ b/misc/hash.c @@ -11,11 +11,14 @@ 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 HAVE_CONFIG_H +#include +#endif + #ifdef RCS -static char rcsid[] = "$Id: hash.c,v 1.1.1.1 2001-01-19 03:30:14 bradleyb Exp $"; +static char rcsid[] = "$Id: hash.c,v 1.2 2001-01-31 15:18:04 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/misc/strio.c b/misc/strio.c index 3a7a82dd..93173825 100644 --- a/misc/strio.c +++ b/misc/strio.c @@ -1,5 +1,9 @@ /**strio.c: string/file manipulation functions by Victor Rachels **/ + +#ifdef HAVE_CONFIG_H #include +#endif + #include #include #include "strio.h" diff --git a/misc/strutil.c b/misc/strutil.c index 314d0057..05b2d69f 100644 --- a/misc/strutil.c +++ b/misc/strutil.c @@ -11,7 +11,10 @@ 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 HAVE_CONFIG_H #include +#endif + #include #include #include diff --git a/texmap/Makefile.am b/texmap/Makefile.am index 919f3059..5333b766 100644 --- a/texmap/Makefile.am +++ b/texmap/Makefile.am @@ -1,7 +1,11 @@ noinst_LIBRARIES = libtexmap.a INCLUDES = -I $(top_srcdir)/includes -DFL1_WITH_FLAT +if USE_ASM libtexmap_a_SOURCES = ntmap.c tmapflat.c +else +libtexmap_a_SOURCES = ntmap.c tmapflat.c scanline.c +endif SUFFIXES = .asm %.o: %.asm @@ -9,8 +13,6 @@ SUFFIXES = .asm if USE_ASM libtexmap_a_LIBADD += tmapppro.o tmap_ll.o tmap_flt.o tmap_lin.o tmapfade.o -else -libtexmap_a_LIBADD += scanline.o endif EXTRA_DIST = \ diff --git a/texmap/ntmap.c b/texmap/ntmap.c index 02a1ae7b..2792a464 100644 --- a/texmap/ntmap.c +++ b/texmap/ntmap.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/texmap/ntmap.c,v $ - * $Revision: 1.2 $ + * $Revision: 1.3 $ * $Author: bradleyb $ - * $Date: 2001-01-31 14:04:46 $ + * $Date: 2001-01-31 15:18:04 $ * * Start of conversion to new texture mapper. * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/31 14:04:46 bradleyb + * Fix compiler warnings + * * Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb * Import of d2x-0.0.8 * @@ -136,11 +139,13 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ -#ifdef RCS -static char rcsid[] = "$Id: ntmap.c,v 1.2 2001-01-31 14:04:46 bradleyb Exp $"; +#ifdef HAVE_CONFIG_H +#include #endif -#include +#ifdef RCS +static char rcsid[] = "$Id: ntmap.c,v 1.3 2001-01-31 15:18:04 bradleyb Exp $"; +#endif #define VESA 0 #define NUM_TMAPS 16 diff --git a/texmap/scanline.c b/texmap/scanline.c index 3f3925dd..3aa399be 100644 --- a/texmap/scanline.c +++ b/texmap/scanline.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/texmap/scanline.c,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:30:16 $ + * $Date: 2001-01-31 15:18:04 $ * * Routines to draw the texture mapped scanlines. * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb + * Import of d2x-0.0.8 + * * Revision 1.4 1999/10/18 00:31:01 donut * more alpha fixes from Falk Hueffner * @@ -40,12 +43,14 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H +#include +#endif #ifdef RCS -static char rcsid[] = "$Id: scanline.c,v 1.1.1.1 2001-01-19 03:30:16 bradleyb Exp $"; +static char rcsid[] = "$Id: scanline.c,v 1.2 2001-01-31 15:18:04 bradleyb Exp $"; #endif -#include #include #include #include diff --git a/texmap/tmapflat.c b/texmap/tmapflat.c index 321ea6c6..6c657222 100644 --- a/texmap/tmapflat.c +++ b/texmap/tmapflat.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/texmap/tmapflat.c,v $ - * $Revision: 1.2 $ + * $Revision: 1.3 $ * $Author: bradleyb $ - * $Date: 2001-01-31 14:04:46 $ + * $Date: 2001-01-31 15:18:05 $ * * Flat shader derived from texture mapper (a little slow) * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/01/31 14:04:46 bradleyb + * Fix compiler warnings + * * Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb * Import of d2x-0.0.8 * @@ -73,7 +76,9 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef HAVE_CONFIG_H #include +#endif #include "fix.h" #include "vecmat.h" -- 2.39.2