From 8051f23b2895a3e078f07b96258fa44b98bb2b6a Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 7 Jul 2012 18:35:06 +0000 Subject: [PATCH] Rename include/error.h to include/dxxerror.h Avoid conflict with generic system header. --- 2d/2dsline.c | 2 +- 2d/bitblt.c | 2 +- 2d/bitmap.c | 2 +- 2d/font.c | 2 +- 2d/ibitblt.c | 4 ++-- 2d/palette.c | 2 +- 2d/rle.c | 2 +- 2d/scale.c | 2 +- 3d/clipper.c | 2 +- 3d/draw.c | 2 +- 3d/instance.c | 3 ++- 3d/interp.c | 2 +- 3d/setup.c | 2 +- VisualC/d2x/d2x.dsp | 2 +- VisualC/d2xgl/d2xgl.dsp | 2 +- VisualCE/d2x/d2x.vcp | 2 +- arch/dos/allg_snd/allg_snd.c | 2 +- arch/dos/bak/ipx.c | 2 +- arch/dos/digi.c | 2 +- arch/dos/digiallg.c | 2 +- arch/dos/digimm.c | 2 +- arch/dos/disk.c | 2 +- arch/dos/dpmi.c | 2 +- arch/dos/init.c | 2 +- arch/dos/ipx.c | 2 +- arch/dos/joydefs.c | 2 +- arch/dos/key.c | 2 +- arch/dos/mouse.c | 2 +- arch/dos/rbaudio.c | 2 +- arch/dos/vid.c | 2 +- arch/linux/alsadigi.c | 2 +- arch/linux/init.c | 2 +- arch/linux/ipx_mcast4.c | 2 +- arch/linux/joydefs.c | 2 +- arch/linux/linuxnet.c | 4 ++-- arch/ogl/glx.c | 2 +- arch/ogl/ogl.c | 2 +- arch/ogl/sdlgl.c | 2 +- arch/ogl/vid.c | 2 +- arch/ogl/wgl.c | 2 +- arch/sdl/digi.c | 2 +- arch/sdl/init.c | 2 +- arch/sdl/joy.c | 2 +- arch/sdl/key.c | 2 +- arch/sdl/rbaudio.c | 2 +- arch/sdl/vid.c | 2 +- arch/svgalib/key.c | 2 +- arch/svgalib/vid.c | 2 +- arch/win32/digi.c | 2 +- arch/win32/joydefs.c | 2 +- arch/win32/midi.c | 2 +- arch/win32/mingw_init.c | 2 +- arch/win32/mouse.c | 2 +- arch/win32/vid.c | 2 +- arch/win32/win32.c | 2 +- d2x.xcodeproj/project.pbxproj | 4 ++-- iff/iff.c | 2 +- include/{error.h => dxxerror.h} | 0 include/physfsx.h | 2 +- main/ai.c | 2 +- main/ai2.c | 2 +- main/aipath.c | 2 +- main/automap.c | 2 +- main/bm.c | 2 +- main/bmread.c | 2 +- main/cmd.c | 2 +- main/cntrlcen.c | 2 +- main/collide.c | 2 +- main/console.c | 2 +- main/controls.c | 2 +- main/credits.c | 2 +- main/cvar.c | 2 +- main/digiobj.c | 2 +- main/dumpmine.c | 2 +- main/editor/autosave.c | 2 +- main/editor/centers.c | 2 +- main/editor/ehostage.c | 2 +- main/editor/elight.c | 2 +- main/editor/eobject.c | 2 +- main/editor/eswitch.c | 2 +- main/editor/fixseg.c | 2 +- main/editor/group.c | 2 +- main/editor/info.c | 2 +- main/editor/kfuncs.c | 2 +- main/editor/kmine.c | 2 +- main/editor/ksegsize.c | 2 +- main/editor/macro.c | 2 +- main/editor/med.c | 2 +- main/editor/meddraw.c | 2 +- main/editor/medmisc.c | 2 +- main/editor/medrobot.c | 2 +- main/editor/medsel.c | 2 +- main/editor/medwall.c | 2 +- main/editor/mine.c | 2 +- main/editor/objpage.c | 2 +- main/editor/segment.c | 2 +- main/editor/seguvs.c | 2 +- main/editor/texpage.c | 2 +- main/editor/texture.c | 2 +- main/effects.c | 2 +- main/endlevel.c | 2 +- main/escort.c | 2 +- main/fireball.c | 2 +- main/fuelcen.c | 2 +- main/fvi.c | 2 +- main/game.c | 2 +- main/gamecntl.c | 2 +- main/gamemine.c | 2 +- main/gamerend.c | 2 +- main/gamesave.c | 2 +- main/gameseg.c | 2 +- main/gameseq.c | 2 +- main/gauges.c | 2 +- main/hostage.c | 2 +- main/hud.c | 2 +- main/inferno.c | 2 +- main/joydefs.c | 2 +- main/kconfig.c | 2 +- main/kmatrix.c | 2 +- main/laser.c | 2 +- main/lighting.c | 2 +- main/menu.c | 2 +- main/mission.c | 2 +- main/morph.c | 2 +- main/movie.c | 2 +- main/multi.c | 2 +- main/multibot.c | 2 +- main/netmisc.c | 2 +- main/network.c | 2 +- main/newdemo.c | 2 +- main/newmenu.c | 2 +- main/object.c | 2 +- main/old/cdmix32.c | 2 +- main/old/descentw.c | 2 +- main/old/iglasses.c | 2 +- main/old/joydefsw.c | 2 +- main/old/modem.c | 2 +- main/old/newmodel.c | 2 +- main/old/rbtest.c | 4 ++-- main/old/windigi.c | 2 +- main/old/winferno.c | 2 +- main/old/winmodem.c | 2 +- main/paging.c | 2 +- main/physics.c | 2 +- main/piggy.c | 2 +- main/polyobj.c | 2 +- main/powerup.c | 2 +- main/render.c | 2 +- main/robot.c | 2 +- main/scores.c | 2 +- main/slew.c | 2 +- main/songs.c | 2 +- main/state.c | 2 +- main/switch.c | 2 +- main/terrain.c | 2 +- main/texmerge.c | 2 +- main/text.c | 2 +- main/titles.c | 2 +- main/vclip.c | 2 +- main/wall.c | 2 +- main/weapon.c | 2 +- maths/fixc.c | 2 +- maths/vecmat.c | 2 +- mem/mem.c | 2 +- misc/error.c | 2 +- misc/errtest.c | 4 ++-- misc/hash.c | 2 +- misc/strutil.c | 2 +- texmap/ntmap.c | 2 +- texmap/tmapflat.c | 2 +- ui/keypad.c | 2 +- ui/menubar.c | 2 +- unused/bios/dpmi.c | 4 ++-- unused/bios/error.c | 2 +- unused/bios/ipx.c | 2 +- unused/bios/joyc.c | 2 +- unused/bios/key.c | 2 +- unused/bios/mouse.c | 2 +- unused/bios/rbaudio.c | 2 +- unused/bios/rbaudio.new | 2 +- unused/pa_null/poly_acc.c | 2 +- unused/vga/palette.c | 2 +- unused/vga/vga.c | 2 +- unused/vga/vga.jas | 4 ++-- unused/win95/comm.c | 2 +- unused/win95/dd.c | 2 +- unused/win95/ddgfx.c | 2 +- unused/win95/ddgr.c | 2 +- unused/win95/ddraw.c | 2 +- unused/win95/direct3d.c | 2 +- unused/win95/error.c | 2 +- unused/win95/gfx.c | 2 +- unused/win95/ipx.c | 2 +- unused/win95/key.c | 2 +- unused/win95/mouse.c | 2 +- unused/win95/palette.c | 2 +- unused/win95/rbaudio.c | 2 +- unused/win95/timer.c | 2 +- unused/win95/winmidi.c | 2 +- unused/win95/winregs.c | 2 +- unused/win95/xtapi.c | 2 +- 201 files changed, 208 insertions(+), 207 deletions(-) rename include/{error.h => dxxerror.h} (100%) diff --git a/2d/2dsline.c b/2d/2dsline.c index d4f1d495..dda12e30 100644 --- a/2d/2dsline.c +++ b/2d/2dsline.c @@ -25,7 +25,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "gr.h" -#include "error.h" +#include "dxxerror.h" #ifdef __MSDOS__ #include "modex.h" diff --git a/2d/bitblt.c b/2d/bitblt.c index 2b86cad8..5c333021 100644 --- a/2d/bitblt.c +++ b/2d/bitblt.c @@ -25,7 +25,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "mono.h" #include "byteswap.h" // because of rle code that has short for row offsets -#include "error.h" +#include "dxxerror.h" #ifdef OGL #include "ogl_init.h" diff --git a/2d/bitmap.c b/2d/bitmap.c index dc581dcc..8a188915 100644 --- a/2d/bitmap.c +++ b/2d/bitmap.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "gr.h" #include "u_dpmi.h" -#include "error.h" +#include "dxxerror.h" #ifdef OGL #include "ogl_init.h" diff --git a/2d/font.c b/2d/font.c index 589ad86d..739a87b9 100644 --- a/2d/font.c +++ b/2d/font.c @@ -33,7 +33,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "gr.h" -#include "error.h" +#include "dxxerror.h" #include "cfile.h" #include "mono.h" #include "byteswap.h" diff --git a/2d/ibitblt.c b/2d/ibitblt.c index 39c0db45..056f9378 100644 --- a/2d/ibitblt.c +++ b/2d/ibitblt.c @@ -40,7 +40,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "types.h" #include "gr.h" #include "mem.h" -#include "error.h" +#include "dxxerror.h" #define MODE_NONE 0 @@ -539,7 +539,7 @@ void gr_ibitblt_find_hole_size( grs_bitmap * mask_bmp, int *minx, int *miny, #else /* __MSDOS__ */ // was: /* !MACINTOSH */ #include "gr.h" -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" diff --git a/2d/palette.c b/2d/palette.c index c1f29da5..a94ad32c 100644 --- a/2d/palette.c +++ b/2d/palette.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "gr.h" #include "cfile.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "fix.h" //added/remove by dph on 1/9/99 diff --git a/2d/rle.c b/2d/rle.c index 58ae2319..4a687491 100644 --- a/2d/rle.c +++ b/2d/rle.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "mono.h" #include "gr.h" -#include "error.h" +#include "dxxerror.h" //#include "key.h" #include "byteswap.h" diff --git a/2d/scale.c b/2d/scale.c index 41dd124b..b35738b3 100644 --- a/2d/scale.c +++ b/2d/scale.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mono.h" #include "maths.h" #include "gr.h" -#include "error.h" +#include "dxxerror.h" #if 0 #define TRANSPARENCY_COLOR 255; diff --git a/3d/clipper.c b/3d/clipper.c index fe3d5f27..478c3a0b 100644 --- a/3d/clipper.c +++ b/3d/clipper.c @@ -18,7 +18,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "3d.h" #include "globvars.h" #include "clipper.h" -#include "error.h" +#include "dxxerror.h" int free_point_num=0; diff --git a/3d/draw.c b/3d/draw.c index 209b4d96..442fbf1e 100644 --- a/3d/draw.c +++ b/3d/draw.c @@ -20,7 +20,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #endif -#include "error.h" +#include "dxxerror.h" #include "3d.h" #include "globvars.h" diff --git a/3d/instance.c b/3d/instance.c index 91e13679..419b653d 100644 --- a/3d/instance.c +++ b/3d/instance.c @@ -21,7 +21,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include -#include "error.h" + +#include "dxxerror.h" #include "3d.h" #include "globvars.h" diff --git a/3d/interp.c b/3d/interp.c index 2d341428..27e0ee3c 100644 --- a/3d/interp.c +++ b/3d/interp.c @@ -22,7 +22,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include -#include "error.h" +#include "dxxerror.h" #include "3d.h" #include "globvars.h" #include "gr.h" diff --git a/3d/setup.c b/3d/setup.c index 09bd1c78..a71b5359 100644 --- a/3d/setup.c +++ b/3d/setup.c @@ -22,7 +22,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include -#include "error.h" +#include "dxxerror.h" #include "3d.h" #include "globvars.h" diff --git a/VisualC/d2x/d2x.dsp b/VisualC/d2x/d2x.dsp index 88aa93ba..ebc57182 100644 --- a/VisualC/d2x/d2x.dsp +++ b/VisualC/d2x/d2x.dsp @@ -764,7 +764,7 @@ SOURCE=..\..\main\endlevel.h # End Source File # Begin Source File -SOURCE=..\..\include\error.h +SOURCE=..\..\include\dxxerror.h # End Source File # Begin Source File diff --git a/VisualC/d2xgl/d2xgl.dsp b/VisualC/d2xgl/d2xgl.dsp index aaca7ecc..294a814b 100644 --- a/VisualC/d2xgl/d2xgl.dsp +++ b/VisualC/d2xgl/d2xgl.dsp @@ -768,7 +768,7 @@ SOURCE=..\..\main\endlevel.h # End Source File # Begin Source File -SOURCE=..\..\include\error.h +SOURCE=..\..\include\dxxerror.h # End Source File # Begin Source File diff --git a/VisualCE/d2x/d2x.vcp b/VisualCE/d2x/d2x.vcp index a41fbcbe..cd280881 100644 --- a/VisualCE/d2x/d2x.vcp +++ b/VisualCE/d2x/d2x.vcp @@ -16161,7 +16161,7 @@ SOURCE=..\..\include\d_io.h # End Source File # Begin Source File -SOURCE=..\..\include\error.h +SOURCE=..\..\include\dxxerror.h # End Source File # Begin Source File diff --git a/arch/dos/allg_snd/allg_snd.c b/arch/dos/allg_snd/allg_snd.c index e3ac1fd5..6f6a6a5c 100644 --- a/arch/dos/allg_snd/allg_snd.c +++ b/arch/dos/allg_snd/allg_snd.c @@ -10,7 +10,7 @@ #include "cfile.h" #include "internal.h" #include -#include "error.h" +#include "dxxerror.h" #include "timer.h" #include "d_io.h" diff --git a/arch/dos/bak/ipx.c b/arch/dos/bak/ipx.c index face6b59..17e9a7b4 100644 --- a/arch/dos/bak/ipx.c +++ b/arch/dos/bak/ipx.c @@ -34,7 +34,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "types.h" #include "timer.h" #include "ipx.h" -#include "error.h" +#include "dxxerror.h" #include "u_dpmi.h" #include "key.h" diff --git a/arch/dos/digi.c b/arch/dos/digi.c index a4af489a..72385328 100644 --- a/arch/dos/digi.c +++ b/arch/dos/digi.c @@ -14,7 +14,7 @@ #include #include "pstypes.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "fix.h" #include "gr.h" // needed for piggy.h diff --git a/arch/dos/digiallg.c b/arch/dos/digiallg.c index a93e277b..2bc76d19 100644 --- a/arch/dos/digiallg.c +++ b/arch/dos/digiallg.c @@ -25,7 +25,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "args.h" #include "key.h" #include "u_dpmi.h" -#include "error.h" +#include "dxxerror.h" #include "cfile.h" #include "midiallg.h" diff --git a/arch/dos/digimm.c b/arch/dos/digimm.c index 60bd0d01..df05453f 100644 --- a/arch/dos/digimm.c +++ b/arch/dos/digimm.c @@ -10,7 +10,7 @@ //#include "SDL.h" //#include "SDL_audio.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "fix.h" #include "gr.h" // needed for piggy.h diff --git a/arch/dos/disk.c b/arch/dos/disk.c index 0d18ecf8..b1288d21 100644 --- a/arch/dos/disk.c +++ b/arch/dos/disk.c @@ -2,7 +2,7 @@ #include #include #include "pstypes.h" -#include "error.h" +#include "dxxerror.h" unsigned long getdiskfree() { struct diskfree_t dfree; diff --git a/arch/dos/dpmi.c b/arch/dos/dpmi.c index 603cd087..2de91397 100644 --- a/arch/dos/dpmi.c +++ b/arch/dos/dpmi.c @@ -41,7 +41,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "u_dpmi.h" int dpmi_find_dos_memory() diff --git a/arch/dos/init.c b/arch/dos/init.c index 737339ea..340efc1f 100644 --- a/arch/dos/init.c +++ b/arch/dos/init.c @@ -20,7 +20,7 @@ #include "text.h" #include "console.h" #include "args.h" -#include "error.h" +#include "dxxerror.h" #include "joy.h" #include "timer.h" diff --git a/arch/dos/ipx.c b/arch/dos/ipx.c index 6afabe8d..214406dd 100644 --- a/arch/dos/ipx.c +++ b/arch/dos/ipx.c @@ -38,7 +38,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "timer.h" #include "ipx.h" -#include "error.h" +#include "dxxerror.h" #include "u_dpmi.h" #include "key.h" #include "ipx_drv.h" diff --git a/arch/dos/joydefs.c b/arch/dos/joydefs.c index 3321054e..090849be 100644 --- a/arch/dos/joydefs.c +++ b/arch/dos/joydefs.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "joy.h" #include "timer.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "gr.h" #include "args.h" diff --git a/arch/dos/key.c b/arch/dos/key.c index ecf21460..16bbc73d 100644 --- a/arch/dos/key.c +++ b/arch/dos/key.c @@ -37,7 +37,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define near _go32_dpmi_seginfo kbd_hand_info; #endif -#include "error.h" +#include "dxxerror.h" #include "key.h" #include "timer.h" #include "u_dpmi.h" diff --git a/arch/dos/mouse.c b/arch/dos/mouse.c index c6b0ddd2..49ef40e1 100644 --- a/arch/dos/mouse.c +++ b/arch/dos/mouse.c @@ -37,7 +37,7 @@ _go32_dpmi_registers handler_regs; //#include #include -#include "error.h" +#include "dxxerror.h" #include "fix.h" #include "u_dpmi.h" #include "mouse.h" diff --git a/arch/dos/rbaudio.c b/arch/dos/rbaudio.c index 8855dea9..e6f4526c 100644 --- a/arch/dos/rbaudio.c +++ b/arch/dos/rbaudio.c @@ -13,7 +13,7 @@ #include #include #include "pstypes.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" #include "rbaudio.h" diff --git a/arch/dos/vid.c b/arch/dos/vid.c index 42a14166..85b16ab2 100644 --- a/arch/dos/vid.c +++ b/arch/dos/vid.c @@ -21,7 +21,7 @@ #include "u_dpmi.h" #include "vesa.h" #include "modex.h" -#include "error.h" +#include "dxxerror.h" #ifdef __DJGPP__ #include diff --git a/arch/linux/alsadigi.c b/arch/linux/alsadigi.c index e81d9b65..cc4e823b 100644 --- a/arch/linux/alsadigi.c +++ b/arch/linux/alsadigi.c @@ -10,7 +10,7 @@ #include #include -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "maths.h" #include "gr.h" // needed for piggy.h diff --git a/arch/linux/init.c b/arch/linux/init.c index 7bcf6dad..436816b5 100644 --- a/arch/linux/init.c +++ b/arch/linux/init.c @@ -13,7 +13,7 @@ #include "pstypes.h" #include "console.h" #include "event.h" -#include "error.h" +#include "dxxerror.h" #include "joy.h" #include "args.h" diff --git a/arch/linux/ipx_mcast4.c b/arch/linux/ipx_mcast4.c index 015a926e..f4bb8655 100644 --- a/arch/linux/ipx_mcast4.c +++ b/arch/linux/ipx_mcast4.c @@ -30,7 +30,7 @@ #include "pstypes.h" #include "ipx_mcast4.h" #include "args.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" diff --git a/arch/linux/joydefs.c b/arch/linux/joydefs.c index 5c8d51d0..6d6e0e74 100644 --- a/arch/linux/joydefs.c +++ b/arch/linux/joydefs.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "joy.h" #include "timer.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" //#include "victor.h" #include "gr.h" diff --git a/arch/linux/linuxnet.c b/arch/linux/linuxnet.c index ece919c8..df864249 100644 --- a/arch/linux/linuxnet.c +++ b/arch/linux/linuxnet.c @@ -38,7 +38,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "args.h" -#include "error.h" +#include "dxxerror.h" #include "ipx.h" #include "ipx_drv.h" @@ -50,7 +50,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "ipx_udp.h" #include "ipx_mcast4.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" //added 05/17/99 Matt Mueller - needed to redefine FD_* so that no asm is used //#include "checker.h" diff --git a/arch/ogl/glx.c b/arch/ogl/glx.c index 4a065aba..530cc166 100644 --- a/arch/ogl/glx.c +++ b/arch/ogl/glx.c @@ -15,7 +15,7 @@ #include "internal.h" #include "vers_id.h" -#include "error.h" +#include "dxxerror.h" #include "event.h" #include "mono.h" #include "u_mem.h" diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c index 011b9f0b..7881ff4d 100644 --- a/arch/ogl/ogl.c +++ b/arch/ogl/ogl.c @@ -30,7 +30,7 @@ #include "3d.h" #include "inferno.h" #include "../../3d/globvars.h" -#include "error.h" +#include "dxxerror.h" #include "texmap.h" #include "gr.h" #include "mono.h" diff --git a/arch/ogl/sdlgl.c b/arch/ogl/sdlgl.c index 7c4d7adb..da9c2015 100644 --- a/arch/ogl/sdlgl.c +++ b/arch/ogl/sdlgl.c @@ -16,7 +16,7 @@ #include "internal.h" #include "vers_id.h" -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" #include "args.h" diff --git a/arch/ogl/vid.c b/arch/ogl/vid.c index 5c26a72b..ab6082e7 100644 --- a/arch/ogl/vid.c +++ b/arch/ogl/vid.c @@ -33,7 +33,7 @@ #include "gr.h" #include "vid.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #include "timer.h" #include "strutil.h" #include "mono.h" diff --git a/arch/ogl/wgl.c b/arch/ogl/wgl.c index 032e2710..38f6cd5c 100644 --- a/arch/ogl/wgl.c +++ b/arch/ogl/wgl.c @@ -18,7 +18,7 @@ #include "internal.h" #include "vers_id.h" -#include "error.h" +#include "dxxerror.h" #include "key.h" #include "joy.h" #include "mouse.h" diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c index bcf589dd..dc1df107 100644 --- a/arch/sdl/digi.c +++ b/arch/sdl/digi.c @@ -16,7 +16,7 @@ #include "SDL.h" #include "SDL_mixer.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "maths.h" #include "gr.h" // needed for piggy.h diff --git a/arch/sdl/init.c b/arch/sdl/init.c index a083eff3..d26bd350 100644 --- a/arch/sdl/init.c +++ b/arch/sdl/init.c @@ -16,7 +16,7 @@ #include "text.h" #include "event.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" #include "digi.h" diff --git a/arch/sdl/joy.c b/arch/sdl/joy.c index 937212e1..244fec81 100644 --- a/arch/sdl/joy.c +++ b/arch/sdl/joy.c @@ -13,7 +13,7 @@ #include #include "joy.h" -#include "error.h" +#include "dxxerror.h" #include "timer.h" #include "console.h" #include "event.h" diff --git a/arch/sdl/key.c b/arch/sdl/key.c index c5d8d53f..8ca3b7f2 100644 --- a/arch/sdl/key.c +++ b/arch/sdl/key.c @@ -17,7 +17,7 @@ #include "inferno.h" #include "game.h" #include "event.h" -#include "error.h" +#include "dxxerror.h" #include "key.h" #include "timer.h" #include "console.h" diff --git a/arch/sdl/rbaudio.c b/arch/sdl/rbaudio.c index ab42dbef..e04a6a1b 100644 --- a/arch/sdl/rbaudio.c +++ b/arch/sdl/rbaudio.c @@ -20,7 +20,7 @@ #endif #include "pstypes.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" #include "rbaudio.h" diff --git a/arch/sdl/vid.c b/arch/sdl/vid.c index 675eb0c9..c5ff4068 100644 --- a/arch/sdl/vid.c +++ b/arch/sdl/vid.c @@ -19,7 +19,7 @@ #include "gr.h" #include "vid.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "timer.h" #include "args.h" diff --git a/arch/svgalib/key.c b/arch/svgalib/key.c index 43b10911..a6fd2ea2 100644 --- a/arch/svgalib/key.c +++ b/arch/svgalib/key.c @@ -15,7 +15,7 @@ #include #include "event.h" -#include "error.h" +#include "dxxerror.h" #include "key.h" #include "timer.h" diff --git a/arch/svgalib/vid.c b/arch/svgalib/vid.c index 1a3d4992..3507faf4 100644 --- a/arch/svgalib/vid.c +++ b/arch/svgalib/vid.c @@ -17,7 +17,7 @@ #include "gr.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #ifdef SVGALIB_INPUT #include #endif diff --git a/arch/win32/digi.c b/arch/win32/digi.c index 64c089bf..c10a67bb 100644 --- a/arch/win32/digi.c +++ b/arch/win32/digi.c @@ -11,7 +11,7 @@ #include -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "fix.h" #include "gr.h" // needed for piggy.h diff --git a/arch/win32/joydefs.c b/arch/win32/joydefs.c index eece039c..3bd97444 100644 --- a/arch/win32/joydefs.c +++ b/arch/win32/joydefs.c @@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "joy.h" #include "timer.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "game.h" diff --git a/arch/win32/midi.c b/arch/win32/midi.c index dbf8c0dc..8078d03f 100644 --- a/arch/win32/midi.c +++ b/arch/win32/midi.c @@ -1,7 +1,7 @@ // MIDI stuff follows. #include -#include "error.h" +#include "dxxerror.h" #include "hmpfile.h" #include "args.h" diff --git a/arch/win32/mingw_init.c b/arch/win32/mingw_init.c index 77510907..ca7c40f6 100644 --- a/arch/win32/mingw_init.c +++ b/arch/win32/mingw_init.c @@ -14,7 +14,7 @@ #include "console.h" #include "text.h" #include "event.h" -#include "error.h" +#include "dxxerror.h" #include "joy.h" #include "args.h" diff --git a/arch/win32/mouse.c b/arch/win32/mouse.c index 831983c0..d5557c4b 100644 --- a/arch/win32/mouse.c +++ b/arch/win32/mouse.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "fix.h" #include "mouse.h" #include "mono.h" diff --git a/arch/win32/vid.c b/arch/win32/vid.c index 607bc766..023e070d 100644 --- a/arch/win32/vid.c +++ b/arch/win32/vid.c @@ -12,7 +12,7 @@ #include "gr.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #include "vers_id.h" #include "gamefont.h" diff --git a/arch/win32/win32.c b/arch/win32/win32.c index 2f77fffc..4e6b2b2e 100644 --- a/arch/win32/win32.c +++ b/arch/win32/win32.c @@ -5,7 +5,7 @@ #include "gr.h" #include "u_mem.h" #include "timer.h" -#include "error.h" +#include "dxxerror.h" #include "d3dhelp.h" #include "game.h" #include "gauges.h" diff --git a/d2x.xcodeproj/project.pbxproj b/d2x.xcodeproj/project.pbxproj index f052f45c..e95c6588 100644 --- a/d2x.xcodeproj/project.pbxproj +++ b/d2x.xcodeproj/project.pbxproj @@ -1061,7 +1061,7 @@ 1466961C1A2729860070D41D /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = ""; }; 1466961D1A2729860070D41D /* d1x.xpm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = d1x.xpm; sourceTree = ""; }; 1466961E1A2729860070D41D /* descent.xpm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = descent.xpm; sourceTree = ""; }; - 1466961F1A2729860070D41D /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = ""; }; + 1466961F1A2729860070D41D /* dxxerror.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dxxerror.h; sourceTree = ""; }; 146696201A2729860070D41D /* fix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fix.h; sourceTree = ""; }; 146696211A2729860070D41D /* func.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = func.h; sourceTree = ""; }; 146696221A2729860070D41D /* gr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gr.h; sourceTree = ""; }; @@ -1956,7 +1956,7 @@ 1466961C1A2729860070D41D /* console.h */, 1466961D1A2729860070D41D /* d1x.xpm */, 1466961E1A2729860070D41D /* descent.xpm */, - 1466961F1A2729860070D41D /* error.h */, + 1466961F1A2729860070D41D /* dxxerror.h */, 146696201A2729860070D41D /* fix.h */, 146696211A2729860070D41D /* func.h */, 146696221A2729860070D41D /* gr.h */, diff --git a/iff/iff.c b/iff/iff.c index da8a7c8d..f3fa0cb3 100644 --- a/iff/iff.c +++ b/iff/iff.c @@ -35,7 +35,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. //#include "nocfile.h" #include "cfile.h" -#include "error.h" +#include "dxxerror.h" #include "makesig.h" #include "physfsx.h" diff --git a/include/error.h b/include/dxxerror.h similarity index 100% rename from include/error.h rename to include/dxxerror.h diff --git a/include/physfsx.h b/include/physfsx.h index 4f62c564..2843b4ef 100644 --- a/include/physfsx.h +++ b/include/physfsx.h @@ -22,7 +22,7 @@ #include #include "pstypes.h" -#include "error.h" +#include "dxxerror.h" #include "vecmat.h" #include "args.h" diff --git a/main/ai.c b/main/ai.c index e4912e01..f3f7b829 100644 --- a/main/ai.c +++ b/main/ai.c @@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "mono.h" #include "3d.h" -#include "error.h" +#include "dxxerror.h" #include "timer.h" #include "key.h" #ifdef EDITOR diff --git a/main/ai2.c b/main/ai2.c index 33b1e11c..0567ad0b 100644 --- a/main/ai2.c +++ b/main/ai2.c @@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mono.h" #include "3d.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #include "timer.h" #include "key.h" #ifdef EDITOR diff --git a/main/aipath.c b/main/aipath.c index 5df9818c..c0807886 100644 --- a/main/aipath.c +++ b/main/aipath.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "mono.h" #include "3d.h" -#include "error.h" +#include "dxxerror.h" #ifdef EDITOR #include "editor/editor.h" #endif diff --git a/main/automap.c b/main/automap.c index 629487c6..dfa00f5c 100644 --- a/main/automap.c +++ b/main/automap.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef OGL #include "ogl_init.h" #endif -#include "error.h" +#include "dxxerror.h" #include "3d.h" #include "inferno.h" #include "u_mem.h" diff --git a/main/bm.c b/main/bm.c index c2dae53d..1c57699b 100644 --- a/main/bm.c +++ b/main/bm.c @@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "u_mem.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "iff.h" #include "cfile.h" #include "makesig.h" diff --git a/main/bmread.c b/main/bmread.c index 81b7debc..2ae61b1c 100644 --- a/main/bmread.c +++ b/main/bmread.c @@ -33,7 +33,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "bm.h" #include "u_mem.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "iff.h" #include "cfile.h" #include "args.h" diff --git a/main/cmd.c b/main/cmd.c index ea6a2e52..ce0baec3 100644 --- a/main/cmd.c +++ b/main/cmd.c @@ -7,7 +7,7 @@ #include #include -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" #include "strutil.h" #include "inferno.h" diff --git a/main/cntrlcen.c b/main/cntrlcen.c index 300f2f3c..2b6760df 100644 --- a/main/cntrlcen.c +++ b/main/cntrlcen.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #endif -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "inferno.h" diff --git a/main/collide.c b/main/collide.c index d7ee8fad..97bc94c5 100644 --- a/main/collide.c +++ b/main/collide.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mono.h" #include "3d.h" #include "key.h" -#include "error.h" +#include "dxxerror.h" #ifdef TACTILE #include "tactile.h" #endif diff --git a/main/console.c b/main/console.c index 6fe2cb82..76844bab 100644 --- a/main/console.c +++ b/main/console.c @@ -30,7 +30,7 @@ #include "key.h" #include "timer.h" #include "pstypes.h" -#include "error.h" +#include "dxxerror.h" #include "cfile.h" diff --git a/main/controls.c b/main/controls.c index 6ca0e5fd..ec10c901 100644 --- a/main/controls.c +++ b/main/controls.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "joy.h" #include "timer.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "args.h" #include "gr.h" diff --git a/main/credits.c b/main/credits.c index 179d2bc8..3eb5ba00 100644 --- a/main/credits.c +++ b/main/credits.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "gr.h" #include "vid.h" #include "mono.h" diff --git a/main/cvar.c b/main/cvar.c index 68f0cf9f..cda20487 100644 --- a/main/cvar.c +++ b/main/cvar.c @@ -9,7 +9,7 @@ #include #include "console.h" -#include "error.h" +#include "dxxerror.h" #include "strutil.h" #include "u_mem.h" #include "hash.h" diff --git a/main/digiobj.c b/main/digiobj.c index 4e5c9d46..6b228eb3 100644 --- a/main/digiobj.c +++ b/main/digiobj.c @@ -38,7 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef __MSDOS__ #include "dpmi.h" #endif -#include "error.h" +#include "dxxerror.h" #include "cfile.h" diff --git a/main/dumpmine.c b/main/dumpmine.c index 2032cf0c..118c2dbe 100644 --- a/main/dumpmine.c +++ b/main/dumpmine.c @@ -35,7 +35,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef EDITOR #include "editor/editor.h" #endif -#include "error.h" +#include "dxxerror.h" #ifdef EDITOR diff --git a/main/editor/autosave.c b/main/editor/autosave.c index 3428aa05..67a521aa 100644 --- a/main/editor/autosave.c +++ b/main/editor/autosave.c @@ -32,7 +32,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "editor.h" #include "mono.h" diff --git a/main/editor/centers.c b/main/editor/centers.c index 45280b07..3e1c8d6c 100644 --- a/main/editor/centers.c +++ b/main/editor/centers.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "timer.h" #include "maths.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "key.h" diff --git a/main/editor/ehostage.c b/main/editor/ehostage.c index bf74f037..fea97fa6 100644 --- a/main/editor/ehostage.c +++ b/main/editor/ehostage.c @@ -38,7 +38,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "timer.h" #include "maths.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "key.h" diff --git a/main/editor/elight.c b/main/editor/elight.c index aba53594..84a9f144 100644 --- a/main/editor/elight.c +++ b/main/editor/elight.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor.h" #include "maths.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "texmap.h" diff --git a/main/editor/eobject.c b/main/editor/eobject.c index 2426e5e7..651d4332 100644 --- a/main/editor/eobject.c +++ b/main/editor/eobject.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor.h" #include "maths.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "3d.h" // For g3_point_to_vec diff --git a/main/editor/eswitch.c b/main/editor/eswitch.c index 5340264b..1f4e0cdd 100644 --- a/main/editor/eswitch.c +++ b/main/editor/eswitch.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "editor.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "timer.h" #include "key.h" diff --git a/main/editor/fixseg.c b/main/editor/fixseg.c index c40e80b7..eaa9cea3 100644 --- a/main/editor/fixseg.c +++ b/main/editor/fixseg.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "inferno.h" #include "editor.h" -#include "error.h" +#include "dxxerror.h" #define SWAP(a,b) {temp = (a); (a) = (b); (b) = temp;} diff --git a/main/editor/group.c b/main/editor/group.c index c642f7dc..735d0cfd 100644 --- a/main/editor/group.c +++ b/main/editor/group.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ui.h" #include "inferno.h" #include "editor.h" -#include "error.h" +#include "dxxerror.h" #include "hash.h" diff --git a/main/editor/info.c b/main/editor/info.c index c1de37a4..05cd0c25 100644 --- a/main/editor/info.c +++ b/main/editor/info.c @@ -35,7 +35,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ui.h" #include "editor.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" int init_info; diff --git a/main/editor/kfuncs.c b/main/editor/kfuncs.c index 2295f5e4..1af99221 100644 --- a/main/editor/kfuncs.c +++ b/main/editor/kfuncs.c @@ -26,7 +26,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "func.h" #include "editor.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" diff --git a/main/editor/kmine.c b/main/editor/kmine.c index 27a7790a..1a218dea 100644 --- a/main/editor/kmine.c +++ b/main/editor/kmine.c @@ -25,7 +25,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "strutil.h" #include "nocfile.h" #include "inferno.h" diff --git a/main/editor/ksegsize.c b/main/editor/ksegsize.c index 81eda24b..2b0d9d24 100644 --- a/main/editor/ksegsize.c +++ b/main/editor/ksegsize.c @@ -26,7 +26,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "editor.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #define XDIM 0 diff --git a/main/editor/macro.c b/main/editor/macro.c index 07789847..2b70a4dc 100644 --- a/main/editor/macro.c +++ b/main/editor/macro.c @@ -36,7 +36,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mono.h" #include "3d.h" #include "mouse.h" -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" diff --git a/main/editor/med.c b/main/editor/med.c index ed6bcebe..b77ccfad 100644 --- a/main/editor/med.c +++ b/main/editor/med.c @@ -44,7 +44,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor.h" #include "key.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" #include "func.h" #include "texmap.h" diff --git a/main/editor/meddraw.c b/main/editor/meddraw.c index b01dd43f..63fbfe9c 100644 --- a/main/editor/meddraw.c +++ b/main/editor/meddraw.c @@ -35,7 +35,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor.h" #include "key.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" #include "func.h" #include "texmap.h" diff --git a/main/editor/medmisc.c b/main/editor/medmisc.c index 386947fc..b89b4d64 100644 --- a/main/editor/medmisc.c +++ b/main/editor/medmisc.c @@ -33,7 +33,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ui.h" #include "3d.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "key.h" #include "func.h" diff --git a/main/editor/medrobot.c b/main/editor/medrobot.c index 106f2f78..63443c37 100644 --- a/main/editor/medrobot.c +++ b/main/editor/medrobot.c @@ -36,7 +36,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "timer.h" #include "maths.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "key.h" diff --git a/main/editor/medsel.c b/main/editor/medsel.c index 32dd9b70..981e674f 100644 --- a/main/editor/medsel.c +++ b/main/editor/medsel.c @@ -33,7 +33,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ui.h" #include "key.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" #include "inferno.h" #include "editor.h" diff --git a/main/editor/medwall.c b/main/editor/medwall.c index 6e148dd5..6aa9dfce 100644 --- a/main/editor/medwall.c +++ b/main/editor/medwall.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "editor.h" -#include "error.h" +#include "dxxerror.h" #include "timer.h" #include "mono.h" #include "key.h" diff --git a/main/editor/mine.c b/main/editor/mine.c index e4a4d2f0..f60a5116 100644 --- a/main/editor/mine.c +++ b/main/editor/mine.c @@ -33,7 +33,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "inferno.h" #include "editor.h" -#include "error.h" +#include "dxxerror.h" #include "ui.h" // Because texpage.h need UI_WINDOW type diff --git a/main/editor/objpage.c b/main/editor/objpage.c index 10fe5907..49ccdf02 100644 --- a/main/editor/objpage.c +++ b/main/editor/objpage.c @@ -34,7 +34,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" // For canves, font stuff #include "ui.h" // For UI_GADGET stuff #include "mono.h" // For debugging -#include "error.h" +#include "dxxerror.h" #define OBJS_PER_PAGE 8 diff --git a/main/editor/segment.c b/main/editor/segment.c index c600ebc5..89ab9d1a 100644 --- a/main/editor/segment.c +++ b/main/editor/segment.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "inferno.h" #include "editor.h" -#include "error.h" +#include "dxxerror.h" int Do_duplicate_vertex_check = 0; // Gets set to 1 in med_create_duplicate_vertex, means to check for duplicate vertices in compress_mine diff --git a/main/editor/seguvs.c b/main/editor/seguvs.c index 75877ab2..6cd6fd5f 100644 --- a/main/editor/seguvs.c +++ b/main/editor/seguvs.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor.h" #include "maths.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" void cast_all_light_in_mine(int quick_flag); diff --git a/main/editor/texpage.c b/main/editor/texpage.c index b4eb2e78..fd17ec57 100644 --- a/main/editor/texpage.c +++ b/main/editor/texpage.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor.h" // For TMAP_CURBOX?????? #include "gr.h" // For canves, font stuff #include "ui.h" // For UI_GADGET stuff -#include "error.h" +#include "dxxerror.h" #include "key.h" #include "mono.h" diff --git a/main/editor/texture.c b/main/editor/texture.c index 91604b42..5e231e78 100644 --- a/main/editor/texture.c +++ b/main/editor/texture.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor.h" #include "maths.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" void compute_uv_side_center(uvl *uvcenter, segment *segp, int sidenum); diff --git a/main/effects.c b/main/effects.c index dd3b047a..63b0548e 100644 --- a/main/effects.c +++ b/main/effects.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "mono.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" int Num_effects; diff --git a/main/endlevel.c b/main/endlevel.c index e6ca6dd8..90bc151e 100644 --- a/main/endlevel.c +++ b/main/endlevel.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "maths.h" #include "gr.h" #include "3d.h" -#include "error.h" +#include "dxxerror.h" #include "iff.h" #include "mono.h" #include "texmap.h" diff --git a/main/escort.c b/main/escort.c index ff457c7a..d97cd5f0 100644 --- a/main/escort.c +++ b/main/escort.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "3d.h" #include "vid.h" -#include "error.h" +#include "dxxerror.h" #include "key.h" #ifdef EDITOR #include "editor/editor.h" diff --git a/main/fireball.c b/main/fireball.c index 5abb2291..12e7c68c 100644 --- a/main/fireball.c +++ b/main/fireball.c @@ -25,7 +25,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "maths.h" #include "gr.h" #include "3d.h" diff --git a/main/fuelcen.c b/main/fuelcen.c index 19169702..91597671 100644 --- a/main/fuelcen.c +++ b/main/fuelcen.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "3d.h" diff --git a/main/fvi.c b/main/fvi.c index acb5af1d..f89c2fb8 100644 --- a/main/fvi.c +++ b/main/fvi.c @@ -33,7 +33,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "inferno.h" #include "gr.h" diff --git a/main/game.c b/main/game.c index 5628389d..0710649e 100644 --- a/main/game.c +++ b/main/game.c @@ -42,7 +42,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "inferno.h" #include "key.h" -#include "error.h" +#include "dxxerror.h" #include "joy.h" #include "mono.h" #include "iff.h" diff --git a/main/gamecntl.c b/main/gamecntl.c index 8157de91..beab2518 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -34,7 +34,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "key.h" -#include "error.h" +#include "dxxerror.h" #include "joy.h" #include "mono.h" #include "iff.h" diff --git a/main/gamemine.c b/main/gamemine.c index cef1513d..d2a00330 100644 --- a/main/gamemine.c +++ b/main/gamemine.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mono.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #ifdef EDITOR #include "editor/editor.h" #endif diff --git a/main/gamerend.c b/main/gamerend.c index 29d0e627..6f399777 100644 --- a/main/gamerend.c +++ b/main/gamerend.c @@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "gr.h" #include "vid.h" diff --git a/main/gamesave.c b/main/gamesave.c index 95ef9af9..d7df8964 100644 --- a/main/gamesave.c +++ b/main/gamesave.c @@ -32,7 +32,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef EDITOR #include "editor/editor.h" #endif -#include "error.h" +#include "dxxerror.h" #include "cfile.h" #include "byteswap.h" #include "makesig.h" diff --git a/main/gameseg.c b/main/gameseg.c index 619d4395..bca9f519 100644 --- a/main/gameseg.c +++ b/main/gameseg.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "maths.h" #include "byteswap.h" diff --git a/main/gameseq.c b/main/gameseq.c index 41f9b80c..f57c02a2 100644 --- a/main/gameseq.c +++ b/main/gameseq.c @@ -35,7 +35,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "vid.h" #include "key.h" -#include "error.h" +#include "dxxerror.h" #include "joy.h" #include "mono.h" #include "iff.h" diff --git a/main/gauges.c b/main/gauges.c index a7d30c8b..4989fc71 100644 --- a/main/gauges.c +++ b/main/gauges.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #ifdef OGL #include "ogl_init.h" diff --git a/main/hostage.c b/main/hostage.c index 5a3f8a28..6dfe7b86 100644 --- a/main/hostage.c +++ b/main/hostage.c @@ -25,7 +25,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "inferno.h" diff --git a/main/hud.c b/main/hud.c index f50f0bac..2f4759fa 100644 --- a/main/hud.c +++ b/main/hud.c @@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "strutil.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "args.h" diff --git a/main/inferno.c b/main/inferno.c index d96de5e5..8cacfe1a 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -54,7 +54,7 @@ char copyright[] = "DESCENT II COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR #include "timer.h" #include "3d.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" #include "texmap.h" #include "args.h" diff --git a/main/joydefs.c b/main/joydefs.c index 28289673..ef2c8b56 100644 --- a/main/joydefs.c +++ b/main/joydefs.c @@ -32,7 +32,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "joy.h" #include "timer.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "game.h" diff --git a/main/kconfig.c b/main/kconfig.c index 21cd79c1..2805f667 100644 --- a/main/kconfig.c +++ b/main/kconfig.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef WINDOWS #include "desw.h" #endif -#include "error.h" +#include "dxxerror.h" #include "gr.h" #include "vid.h" #include "mono.h" diff --git a/main/kmatrix.c b/main/kmatrix.c index 63af019b..e8295015 100644 --- a/main/kmatrix.c +++ b/main/kmatrix.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "gr.h" #include "mono.h" #include "key.h" diff --git a/main/laser.c b/main/laser.c index 7e3d8ce9..5d87ffeb 100644 --- a/main/laser.c +++ b/main/laser.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "args.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "key.h" #include "texmap.h" diff --git a/main/lighting.c b/main/lighting.c index 061db98f..cd230f45 100644 --- a/main/lighting.c +++ b/main/lighting.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "math.h" #include "gr.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "3d.h" #include "timer.h" diff --git a/main/menu.c b/main/menu.c index fcb3f6b5..8624cfa1 100644 --- a/main/menu.c +++ b/main/menu.c @@ -36,7 +36,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "iff.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "joy.h" #include "maths.h" diff --git a/main/mission.c b/main/mission.c index 37657fc4..5876b6b7 100644 --- a/main/mission.c +++ b/main/mission.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "strutil.h" #include "inferno.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" #include "ignorecase.h" diff --git a/main/morph.c b/main/morph.c index 65bce0c7..4aa22bcf 100644 --- a/main/morph.c +++ b/main/morph.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "maths.h" #include "gr.h" #include "texmap.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "mono.h" #include "3d.h" diff --git a/main/movie.c b/main/movie.c index 9359a546..df127524 100644 --- a/main/movie.c +++ b/main/movie.c @@ -38,7 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "inferno.h" #include "strutil.h" -#include "error.h" +#include "dxxerror.h" #include "u_mem.h" #include "byteswap.h" #include "gr.h" diff --git a/main/multi.c b/main/multi.c index cb0fa3de..7a42d256 100644 --- a/main/multi.c +++ b/main/multi.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "strutil.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "key.h" #include "timer.h" diff --git a/main/multibot.c b/main/multibot.c index f6ab35a8..ee3727ed 100644 --- a/main/multibot.c +++ b/main/multibot.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "maths.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "timer.h" #include "byteswap.h" diff --git a/main/netmisc.c b/main/netmisc.c index da7fb71a..198328d2 100644 --- a/main/netmisc.c +++ b/main/netmisc.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "byteswap.h" #include "ipx.h" -#include "error.h" +#include "dxxerror.h" // routine to calculate the checksum of the segments. We add these specialized routines diff --git a/main/network.c b/main/network.c index 9083b11e..bd116eb4 100644 --- a/main/network.c +++ b/main/network.c @@ -39,7 +39,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ipx.h" #include "key.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "byteswap.h" #include "cfile.h" diff --git a/main/newdemo.c b/main/newdemo.c index d56878b9..77e4ee34 100644 --- a/main/newdemo.c +++ b/main/newdemo.c @@ -46,7 +46,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "3d.h" #include "texmap.h" #include "key.h" -#include "error.h" +#include "dxxerror.h" #include "maths.h" #include "args.h" #include "timer.h" diff --git a/main/newmenu.c b/main/newmenu.c index 5b8faf6b..eedbb3ab 100644 --- a/main/newmenu.c +++ b/main/newmenu.c @@ -36,7 +36,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include -#include "error.h" +#include "dxxerror.h" #include "gr.h" #include "vid.h" #include "mono.h" diff --git a/main/object.c b/main/object.c index b2d88864..b5b13ac0 100644 --- a/main/object.c +++ b/main/object.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "3d.h" #include "texmap.h" #include "key.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" #ifdef TACTILE #include "tactile.h" diff --git a/main/old/cdmix32.c b/main/old/cdmix32.c index 22d7baca..cadeba16 100644 --- a/main/old/cdmix32.c +++ b/main/old/cdmix32.c @@ -20,7 +20,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "sos.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" typedef struct { diff --git a/main/old/descentw.c b/main/old/descentw.c index 1d75c8c0..2ac9e426 100644 --- a/main/old/descentw.c +++ b/main/old/descentw.c @@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "winapp.h" -#include "error.h" +#include "dxxerror.h" #include "gr.h" #include "digi.h" #include "key.h" diff --git a/main/old/iglasses.c b/main/old/iglasses.c index 0fe21dc8..3e31ade8 100644 --- a/main/old/iglasses.c +++ b/main/old/iglasses.c @@ -20,7 +20,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "args.h" #include "text.h" diff --git a/main/old/joydefsw.c b/main/old/joydefsw.c index b01071d4..2315459c 100644 --- a/main/old/joydefsw.c +++ b/main/old/joydefsw.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "joy.h" #include "timer.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "game.h" diff --git a/main/old/modem.c b/main/old/modem.c index 13beea04..5ac891fd 100644 --- a/main/old/modem.c +++ b/main/old/modem.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "object.h" #include "player.h" #include "laser.h" -#include "error.h" +#include "dxxerror.h" #include "collide.h" #include "endlevel.h" #include "network.h" diff --git a/main/old/newmodel.c b/main/old/newmodel.c index 006531f9..8237c5da 100644 --- a/main/old/newmodel.c +++ b/main/old/newmodel.c @@ -6,7 +6,7 @@ #include "polyobj.h" #include "vecmat.h" #include "3d.h" -#include "error.h" +#include "dxxerror.h" byte model_tree[MAX_SUBMODELS][MAX_SUBMODELS+1]; g3s_instance_context context_array[MAX_SUBMODELS]; diff --git a/main/old/rbtest.c b/main/old/rbtest.c index db0aebab..f678f53b 100644 --- a/main/old/rbtest.c +++ b/main/old/rbtest.c @@ -3,7 +3,7 @@ #include "dpmi.h" #include "timer.h" #include "key.h" -#include "error.h" +#include "dxxerror.h" #include "rbaudio.h" @@ -49,4 +49,4 @@ int main() return 0; } -ÿ \ No newline at end of file +ÿ diff --git a/main/old/windigi.c b/main/old/windigi.c index 8f8ab09d..1a623ca1 100644 --- a/main/old/windigi.c +++ b/main/old/windigi.c @@ -38,7 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "newdemo.h" #include "game.h" -#include "error.h" +#include "dxxerror.h" #include "wall.h" #include "cfile.h" #include "piggy.h" diff --git a/main/old/winferno.c b/main/old/winferno.c index 188d0930..d907cc76 100644 --- a/main/old/winferno.c +++ b/main/old/winferno.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "3d.h" #include "bm.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "game.h" #include "mem.h" #include "screens.h" diff --git a/main/old/winmodem.c b/main/old/winmodem.c index 04487c4f..cee7015b 100644 --- a/main/old/winmodem.c +++ b/main/old/winmodem.c @@ -32,7 +32,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "object.h" #include "player.h" #include "laser.h" -#include "error.h" +#include "dxxerror.h" #include "collide.h" #include "endlevel.h" #include "network.h" diff --git a/main/paging.c b/main/paging.c index f657e7cd..91e6d633 100644 --- a/main/paging.c +++ b/main/paging.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mono.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "gr.h" #include "timer.h" diff --git a/main/physics.c b/main/physics.c index 8b258c76..0307126e 100644 --- a/main/physics.c +++ b/main/physics.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "joy.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "key.h" #include "timer.h" diff --git a/main/piggy.c b/main/piggy.c index 37610954..35a55c43 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -39,7 +39,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "iff.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "hash.h" #include "args.h" #include "cfile.h" diff --git a/main/polyobj.c b/main/polyobj.c index cb83897c..f89f9c9c 100644 --- a/main/polyobj.c +++ b/main/polyobj.c @@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "maths.h" #include "3d.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "u_mem.h" #include "args.h" diff --git a/main/powerup.c b/main/powerup.c index 47bcfbe3..d17b444c 100644 --- a/main/powerup.c +++ b/main/powerup.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "3d.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "key.h" #ifdef EDITOR diff --git a/main/render.c b/main/render.c index 2fa3c856..ffae9a6b 100644 --- a/main/render.c +++ b/main/render.c @@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "texmap.h" #include "mono.h" #include "3d.h" diff --git a/main/robot.c b/main/robot.c index f0e3cbdc..129b91f4 100644 --- a/main/robot.c +++ b/main/robot.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "mono.h" diff --git a/main/scores.c b/main/scores.c index 6257f63d..1a18e1e7 100644 --- a/main/scores.c +++ b/main/scores.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "scores.h" -#include "error.h" +#include "dxxerror.h" #include "gr.h" #include "vid.h" #include "mono.h" diff --git a/main/slew.c b/main/slew.c index c92a669d..0da9b2e0 100644 --- a/main/slew.c +++ b/main/slew.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "maths.h" #include "key.h" #include "joy.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" diff --git a/main/songs.c b/main/songs.c index fca2d191..48087994 100644 --- a/main/songs.c +++ b/main/songs.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" #include "mono.h" #include "cfile.h" diff --git a/main/state.c b/main/state.c index 1bcfa3a0..bb48715e 100644 --- a/main/state.c +++ b/main/state.c @@ -40,7 +40,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "mono.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "cfile.h" #include "hash.h" #include "key.h" diff --git a/main/switch.c b/main/switch.c index 8d8bd8d0..e72f6eea 100644 --- a/main/switch.c +++ b/main/switch.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "texmap.h" #include "gr.h" diff --git a/main/terrain.c b/main/terrain.c index 83cebec1..fe1fb4a5 100644 --- a/main/terrain.c +++ b/main/terrain.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "3d.h" -#include "error.h" +#include "dxxerror.h" #include "gr.h" #include "texmap.h" #include "iff.h" diff --git a/main/texmerge.c b/main/texmerge.c index 0a6fee64..8081eabe 100644 --- a/main/texmerge.c +++ b/main/texmerge.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "gr.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "mono.h" diff --git a/main/text.c b/main/text.c index af1d33c3..fa464174 100644 --- a/main/text.c +++ b/main/text.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "cfile.h" #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "args.h" diff --git a/main/titles.c b/main/titles.c index d43d0a9a..a0138ca1 100644 --- a/main/titles.c +++ b/main/titles.c @@ -42,7 +42,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "joy.h" #include "mono.h" #include "cfile.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #include "mouse.h" diff --git a/main/vclip.c b/main/vclip.c index fac73da5..af201f87 100644 --- a/main/vclip.c +++ b/main/vclip.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include -#include "error.h" +#include "dxxerror.h" #include "inferno.h" diff --git a/main/wall.c b/main/wall.c index aaeae6f7..c9eefdec 100644 --- a/main/wall.c +++ b/main/wall.c @@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mono.h" #include "gr.h" #include "inferno.h" -#include "error.h" +#include "dxxerror.h" #ifdef EDITOR #include "editor/editor.h" #endif diff --git a/main/weapon.c b/main/weapon.c index 86bf2760..9816a73c 100644 --- a/main/weapon.c +++ b/main/weapon.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" #if defined (TACTILE) #include "tactile.h" diff --git a/maths/fixc.c b/maths/fixc.c index d3973025..77be2805 100644 --- a/maths/fixc.c +++ b/maths/fixc.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "maths.h" #ifdef NO_FIX_INLINE diff --git a/maths/vecmat.c b/maths/vecmat.c index bd5c33bd..38141fe1 100644 --- a/maths/vecmat.c +++ b/maths/vecmat.c @@ -25,7 +25,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include // for sqrt #include "maths.h" -#include "error.h" +#include "dxxerror.h" //#define USE_ISQRT 1 diff --git a/mem/mem.c b/mem/mem.c index 3e9cd7cf..e7af017a 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -39,7 +39,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #ifdef MACINTOSH diff --git a/misc/error.c b/misc/error.c index 7770f904..a262667d 100644 --- a/misc/error.c +++ b/misc/error.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "console.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #define MAX_MSG_LEN 256 diff --git a/misc/errtest.c b/misc/errtest.c index e857c107..75083fab 100644 --- a/misc/errtest.c +++ b/misc/errtest.c @@ -3,7 +3,7 @@ #include -#include "error.h" +#include "dxxerror.h" main(int argc,char **argv) { @@ -15,4 +15,4 @@ main(int argc,char **argv) Error("test of error, argc=%d, argv=%x",argc,argv); } -ÿ \ No newline at end of file +ÿ diff --git a/misc/hash.c b/misc/hash.c index e876d42e..e5f61628 100644 --- a/misc/hash.c +++ b/misc/hash.c @@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "strutil.h" -#include "error.h" +#include "dxxerror.h" #include "hash.h" int hashtable_init( hashtable *ht, int size ) { diff --git a/misc/strutil.c b/misc/strutil.c index 947c2420..356c2de5 100644 --- a/misc/strutil.c +++ b/misc/strutil.c @@ -21,7 +21,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "u_mem.h" -#include "error.h" +#include "dxxerror.h" #include "inferno.h" #ifdef macintosh diff --git a/texmap/ntmap.c b/texmap/ntmap.c index cfae61ef..fd33d7cc 100644 --- a/texmap/ntmap.c +++ b/texmap/ntmap.c @@ -32,7 +32,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "maths.h" #include "gr.h" #include "3d.h" -#include "error.h" +#include "dxxerror.h" #include "console.h" #include "texmap.h" #include "texmapl.h" diff --git a/texmap/tmapflat.c b/texmap/tmapflat.c index 0728715b..27e17c48 100644 --- a/texmap/tmapflat.c +++ b/texmap/tmapflat.c @@ -187,7 +187,7 @@ void gr_upoly_tmap(int nverts, int *vert ) } #include "3d.h" -#include "error.h" +#include "dxxerror.h" typedef struct pnt2d { fix x,y; diff --git a/ui/keypad.c b/ui/keypad.c index 4315e71e..e6db77e3 100644 --- a/ui/keypad.c +++ b/ui/keypad.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" //#include "cflib.h" #include "func.h" -#include "error.h" +#include "dxxerror.h" #define MAX_NUM_PADS 20 diff --git a/ui/menubar.c b/ui/menubar.c index c1bd6fec..fba3cc7f 100644 --- a/ui/menubar.c +++ b/ui/menubar.c @@ -32,7 +32,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "func.h" -#include "error.h" +#include "dxxerror.h" #define MAXMENUS 30 diff --git a/unused/bios/dpmi.c b/unused/bios/dpmi.c index e973aa80..8db905ca 100644 --- a/unused/bios/dpmi.c +++ b/unused/bios/dpmi.c @@ -21,9 +21,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "types.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "dpmi.h" int dpmi_find_dos_memory() diff --git a/unused/bios/error.c b/unused/bios/error.c index 72d51f73..edaee526 100644 --- a/unused/bios/error.c +++ b/unused/bios/error.c @@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" #ifdef MACINTOSH diff --git a/unused/bios/ipx.c b/unused/bios/ipx.c index 1dba42c4..6641211c 100644 --- a/unused/bios/ipx.c +++ b/unused/bios/ipx.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "types.h" #include "timer.h" #include "ipx.h" -#include "error.h" +#include "dxxerror.h" #include "dpmi.h" #include "key.h" diff --git a/unused/bios/joyc.c b/unused/bios/joyc.c index e8d94c90..7fb5311a 100644 --- a/unused/bios/joyc.c +++ b/unused/bios/joyc.c @@ -21,7 +21,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. //#define ARCADE 1 #include "types.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "joy.h" #include "dpmi.h" diff --git a/unused/bios/key.c b/unused/bios/key.c index 756ac2e7..afe5c8cd 100644 --- a/unused/bios/key.c +++ b/unused/bios/key.c @@ -21,7 +21,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. //#define WATCOM_10 -#include "error.h" +#include "dxxerror.h" #include "key.h" #include "timer.h" #include "dpmi.h" diff --git a/unused/bios/mouse.c b/unused/bios/mouse.c index e22276b3..3673577f 100644 --- a/unused/bios/mouse.c +++ b/unused/bios/mouse.c @@ -19,7 +19,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "fix.h" #include "dpmi.h" #include "mouse.h" diff --git a/unused/bios/rbaudio.c b/unused/bios/rbaudio.c index f245a6b4..56ae0189 100644 --- a/unused/bios/rbaudio.c +++ b/unused/bios/rbaudio.c @@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "rbaudio.h" #include "fix.h" #include "timer.h" diff --git a/unused/bios/rbaudio.new b/unused/bios/rbaudio.new index 1a91e405..e5f52660 100644 --- a/unused/bios/rbaudio.new +++ b/unused/bios/rbaudio.new @@ -12,7 +12,7 @@ #include #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "rbaudio.h" #include "fix.h" #include "timer.h" diff --git a/unused/pa_null/poly_acc.c b/unused/pa_null/poly_acc.c index 2edaa05c..589f2288 100644 --- a/unused/pa_null/poly_acc.c +++ b/unused/pa_null/poly_acc.c @@ -34,7 +34,7 @@ static unsigned poly_count; #include "texmap.h" #include "mono.h" #include "debug.h" -#include "error.h" +#include "dxxerror.h" #include "poly_acc.h" // diff --git a/unused/vga/palette.c b/unused/vga/palette.c index 41876c39..fa8c5746 100644 --- a/unused/vga/palette.c +++ b/unused/vga/palette.c @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "grdef.h" #include "cfile.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "fix.h" #include "key.h" diff --git a/unused/vga/vga.c b/unused/vga/vga.c index be7c5981..74f6377c 100644 --- a/unused/vga/vga.c +++ b/unused/vga/vga.c @@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "types.h" #include "mem.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" // New for VGA Library. diff --git a/unused/vga/vga.jas b/unused/vga/vga.jas index 16e4d720..12f6a52c 100644 --- a/unused/vga/vga.jas +++ b/unused/vga/vga.jas @@ -16,7 +16,7 @@ #include "types.h" #include "mem.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" // New for VGA Library. @@ -571,4 +571,4 @@ short vga_check_mode(short mode) return 11; }  - \ No newline at end of file + diff --git a/unused/win95/comm.c b/unused/win95/comm.c index b0deb2de..6cde6a3a 100644 --- a/unused/win95/comm.c +++ b/unused/win95/comm.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mono.h" #include "winapp.h" #include "comm.h" -#include "error.h" +#include "dxxerror.h" #define ASCII_XON 0x11 #define ASCII_XOFF 0x13 diff --git a/unused/win95/dd.c b/unused/win95/dd.c index 65713c3c..21ef22d6 100644 --- a/unused/win95/dd.c +++ b/unused/win95/dd.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "mono.h" #include "args.h" -#include "error.h" +#include "dxxerror.h" #include "winapp.h" #include "dd.h" diff --git a/unused/win95/ddgfx.c b/unused/win95/ddgfx.c index f7457879..25ddc487 100644 --- a/unused/win95/ddgfx.c +++ b/unused/win95/ddgfx.c @@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "rle.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" #include "winapp.h" diff --git a/unused/win95/ddgr.c b/unused/win95/ddgr.c index 369880e8..4bae765b 100644 --- a/unused/win95/ddgr.c +++ b/unused/win95/ddgr.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "winapp.h" #include "mem.h" -#include "error.h" +#include "dxxerror.h" #include "gr.h" #include "dd.h" #include "mono.h" diff --git a/unused/win95/ddraw.c b/unused/win95/ddraw.c index 2d8f70e5..3ad86096 100644 --- a/unused/win95/ddraw.c +++ b/unused/win95/ddraw.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "winapp.h" #include "dd.h" #include "args.h" diff --git a/unused/win95/direct3d.c b/unused/win95/direct3d.c index 043f1ed3..041a6fbe 100644 --- a/unused/win95/direct3d.c +++ b/unused/win95/direct3d.c @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "mono.h" #include "args.h" -#include "error.h" +#include "dxxerror.h" #include "winapp.h" #include "dd.h" diff --git a/unused/win95/error.c b/unused/win95/error.c index 72d51f73..edaee526 100644 --- a/unused/win95/error.c +++ b/unused/win95/error.c @@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "args.h" #ifdef MACINTOSH diff --git a/unused/win95/gfx.c b/unused/win95/gfx.c index 9a39423b..09e6cbfd 100644 --- a/unused/win95/gfx.c +++ b/unused/win95/gfx.c @@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mem.h" #include "mono.h" #include "args.h" -#include "error.h" +#include "dxxerror.h" #include "winapp.h" #include "dd.h" diff --git a/unused/win95/ipx.c b/unused/win95/ipx.c index e852d5c6..9170ec73 100644 --- a/unused/win95/ipx.c +++ b/unused/win95/ipx.c @@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "winapp.h" #include "ipx.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" diff --git a/unused/win95/key.c b/unused/win95/key.c index 5ba4f4fd..e32430a5 100644 --- a/unused/win95/key.c +++ b/unused/win95/key.c @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. //#define WATCOM_10 #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "key.h" #include "timer.h" diff --git a/unused/win95/mouse.c b/unused/win95/mouse.c index d8f636bd..9285f3fb 100644 --- a/unused/win95/mouse.c +++ b/unused/win95/mouse.c @@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "fix.h" #include "mouse.h" #include "timer.h" diff --git a/unused/win95/palette.c b/unused/win95/palette.c index 760a72c0..d55ab0df 100644 --- a/unused/win95/palette.c +++ b/unused/win95/palette.c @@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mem.h" #include "gr.h" #include "cfile.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "fix.h" #include "key.h" diff --git a/unused/win95/rbaudio.c b/unused/win95/rbaudio.c index 3c9b5366..46b21d3a 100644 --- a/unused/win95/rbaudio.c +++ b/unused/win95/rbaudio.c @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "winapp.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "rbaudio.h" #include "fix.h" #include "winapp.h" diff --git a/unused/win95/timer.c b/unused/win95/timer.c index 452d9aa7..fc2bdce9 100644 --- a/unused/win95/timer.c +++ b/unused/win95/timer.c @@ -14,7 +14,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "types.h" #include "fix.h" -#include "error.h" +#include "dxxerror.h" #include "mono.h" #define _WIN32 diff --git a/unused/win95/winmidi.c b/unused/win95/winmidi.c index 0852af8a..e29de84d 100644 --- a/unused/win95/winmidi.c +++ b/unused/win95/winmidi.c @@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "mem.h" #include "winapp.h" #include "winregs.h" diff --git a/unused/win95/winregs.c b/unused/win95/winregs.c index 86ded8d0..d733feb7 100644 --- a/unused/win95/winregs.c +++ b/unused/win95/winregs.c @@ -18,7 +18,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "error.h" +#include "dxxerror.h" #include "mono.h" #include "winregs.h" diff --git a/unused/win95/xtapi.c b/unused/win95/xtapi.c index 5fe0af54..ff48ec7d 100644 --- a/unused/win95/xtapi.c +++ b/unused/win95/xtapi.c @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "mono.h" -#include "error.h" +#include "dxxerror.h" #include "winapp.h" #include "xtapi.h" -- 2.39.2