From f6a91e17228bf1c2198d17476e105d987ef9840d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 31 Jan 2019 19:38:04 +0100 Subject: [PATCH] - moved the I_Error prototypes to doomerrors.h to avoid having to include the low level system header for this. --- src/c_cmds.cpp | 1 - src/c_console.cpp | 2 +- src/cmdlib.cpp | 2 +- src/d_main.cpp | 1 + src/d_net.cpp | 1 + src/d_protocol.cpp | 2 +- src/dobject.h | 2 +- src/dobjtype.cpp | 1 + src/doomerrors.h | 4 ++++ src/files_decompress.cpp | 2 +- src/g_doomedmap.cpp | 1 + src/g_game.cpp | 1 + src/g_level.cpp | 2 +- src/g_mapinfo.cpp | 1 + src/g_statusbar/sbarinfo.cpp | 1 + src/gl_load/gl_interface.cpp | 1 + src/hwrenderer/textures/hw_material.h | 2 +- src/hwrenderer/utility/hw_clock.cpp | 2 +- src/i_net.cpp | 1 + src/m_alloc.cpp | 2 +- src/m_argv.cpp | 1 + src/m_misc.cpp | 1 + src/maploader/maploader.cpp | 2 +- src/maploader/udmf.cpp | 2 +- src/menu/loadsavemenu.cpp | 1 + src/menu/menudef.cpp | 2 +- src/nodebuild_utility.cpp | 2 +- src/p_acs.h | 1 + src/p_effect.cpp | 2 +- src/p_enemy.cpp | 2 +- src/p_mobj.cpp | 2 +- src/p_openmap.cpp | 2 +- src/p_saveg.cpp | 2 +- src/p_setup.cpp | 1 + src/p_sight.cpp | 2 +- src/p_switch.cpp | 2 +- src/polyrenderer/drawers/poly_buffer.cpp | 2 +- src/polyrenderer/drawers/poly_draw_args.cpp | 2 +- src/polyrenderer/drawers/poly_triangle.cpp | 2 +- src/polyrenderer/drawers/screen_triangle.cpp | 2 +- src/polyrenderer/poly_renderthread.cpp | 2 +- src/posix/cocoa/i_main.mm | 1 + src/posix/cocoa/i_video.mm | 1 + src/posix/i_system.h | 3 --- src/posix/sdl/critsec.cpp | 1 + src/posix/sdl/hardware.cpp | 1 + src/posix/sdl/i_main.cpp | 1 + src/posix/unix/i_specialpaths.cpp | 1 + src/r_data/colormaps.cpp | 2 +- src/r_data/gldefs.cpp | 2 +- src/r_data/r_sections.cpp | 2 +- src/r_data/sprites.cpp | 2 +- src/r_utility.cpp | 2 +- src/resourcefiles/file_wad.cpp | 2 +- src/resourcefiles/file_zip.cpp | 2 +- src/s_advsound.cpp | 1 + src/sc_man.cpp | 2 +- src/scripting/vm/jitintern.h | 2 +- src/scripting/vmthunks.cpp | 1 + src/scriptutil.cpp | 2 +- src/sound/mididevices/music_fluidsynth_mididevice.cpp | 1 + src/sound/mididevices/music_opl_mididevice.cpp | 2 +- src/sound/mididevices/music_opnmidi_mididevice.cpp | 2 +- src/sound/mididevices/music_timiditypp_mididevice.cpp | 2 +- src/sound/mididevices/music_wildmidi_mididevice.cpp | 2 +- src/sound/mididevices/music_win_mididevice.cpp | 2 +- src/sound/musicformats/music_dumb.cpp | 2 +- src/sound/timidity/common.cpp | 2 +- src/sound/timidity/timidity.cpp | 1 + src/swrenderer/drawers/r_draw.cpp | 2 +- src/swrenderer/drawers/r_draw_rgba.cpp | 2 +- src/swrenderer/line/r_farclip_line.cpp | 2 +- src/swrenderer/line/r_fogboundary.cpp | 2 +- src/swrenderer/line/r_line.cpp | 2 +- src/swrenderer/line/r_renderdrawsegment.cpp | 2 +- src/swrenderer/line/r_wallsetup.cpp | 2 +- src/swrenderer/plane/r_flatplane.cpp | 2 +- src/swrenderer/plane/r_planerenderer.cpp | 2 +- src/swrenderer/plane/r_skyplane.cpp | 2 +- src/swrenderer/plane/r_slopeplane.cpp | 2 +- src/swrenderer/plane/r_visibleplane.cpp | 2 +- src/swrenderer/plane/r_visibleplanelist.cpp | 2 +- src/swrenderer/r_memory.cpp | 2 +- src/swrenderer/r_renderthread.cpp | 2 +- src/swrenderer/r_swscene.cpp | 1 + src/swrenderer/scene/r_light.cpp | 2 +- src/swrenderer/scene/r_opaque_pass.cpp | 2 +- src/swrenderer/scene/r_portal.cpp | 2 +- src/swrenderer/scene/r_scene.cpp | 2 +- src/swrenderer/scene/r_translucent_pass.cpp | 2 +- src/swrenderer/segments/r_clipsegment.cpp | 2 +- src/swrenderer/segments/r_drawsegment.cpp | 2 +- src/swrenderer/segments/r_portalsegment.cpp | 2 +- src/swrenderer/things/r_decal.cpp | 2 +- src/swrenderer/things/r_particle.cpp | 2 +- src/swrenderer/things/r_playersprite.cpp | 2 +- src/swrenderer/things/r_sprite.cpp | 2 +- src/swrenderer/things/r_visiblesprite.cpp | 2 +- src/swrenderer/things/r_visiblespritelist.cpp | 2 +- src/swrenderer/things/r_wallsprite.cpp | 2 +- src/swrenderer/viewport/r_viewport.cpp | 2 +- src/teaminfo.cpp | 2 +- src/textures/animations.cpp | 2 +- src/textures/formats/brightmaptexture.cpp | 2 +- src/textures/formats/fontchars.cpp | 1 + src/textures/formats/multipatchtexture.cpp | 2 +- src/textures/multipatchtexturebuilder.cpp | 2 +- src/textures/texture.cpp | 2 +- src/textures/texturemanager.cpp | 2 +- src/v_framebuffer.cpp | 2 +- src/v_pfx.cpp | 2 +- src/v_text.cpp | 2 +- src/v_video.cpp | 1 + src/wi_stuff.cpp | 2 +- src/win32/hardware.cpp | 2 ++ src/win32/i_cd.cpp | 1 + src/win32/i_input.cpp | 2 ++ src/win32/i_main.cpp | 1 + src/win32/i_system.cpp | 1 + src/win32/i_system.h | 3 --- src/win32/st_start.cpp | 1 + 121 files changed, 123 insertions(+), 91 deletions(-) diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp index fac4ff6a3..995677209 100644 --- a/src/c_cmds.cpp +++ b/src/c_cmds.cpp @@ -47,7 +47,6 @@ #include "c_dispatch.h" #include "i_system.h" - #include "doomerrors.h" #include "doomstat.h" #include "gstrings.h" diff --git a/src/c_console.cpp b/src/c_console.cpp index d72b29465..b05e4c5a1 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -34,7 +34,7 @@ #include "templates.h" #include "p_setup.h" - +#include "i_system.h" #include "version.h" #include "g_game.h" #include "c_bind.h" diff --git a/src/cmdlib.cpp b/src/cmdlib.cpp index b313f5691..7a7436c19 100644 --- a/src/cmdlib.cpp +++ b/src/cmdlib.cpp @@ -35,7 +35,7 @@ #endif #include "doomtype.h" #include "cmdlib.h" -#include "i_system.h" +#include "doomerrors.h" #include "v_text.h" #include "sc_man.h" diff --git a/src/d_main.cpp b/src/d_main.cpp index b04fc33e6..c28c25ab9 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -99,6 +99,7 @@ #include "events.h" #include "vm.h" #include "types.h" +#include "i_system.h" #include "g_cvars.h" #include "r_data/r_vanillatrans.h" diff --git a/src/d_net.cpp b/src/d_net.cpp index 1f360a8d2..ac65061c6 100644 --- a/src/d_net.cpp +++ b/src/d_net.cpp @@ -64,6 +64,7 @@ #include "actorinlines.h" #include "events.h" #include "i_time.h" +#include "i_system.h" #include "vm.h" EXTERN_CVAR (Int, disableautosave) diff --git a/src/d_protocol.cpp b/src/d_protocol.cpp index 1a0ebcc02..107941976 100644 --- a/src/d_protocol.cpp +++ b/src/d_protocol.cpp @@ -32,7 +32,7 @@ ** */ -#include "i_system.h" + #include "d_protocol.h" #include "d_net.h" #include "doomstat.h" diff --git a/src/dobject.h b/src/dobject.h index b57f75bed..a4e16dc0b 100644 --- a/src/dobject.h +++ b/src/dobject.h @@ -37,7 +37,7 @@ #include #include #include "doomtype.h" -#include "i_system.h" + #include "vectors.h" class PClass; diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp index 96a135a03..c0c8e2432 100644 --- a/src/dobjtype.cpp +++ b/src/dobjtype.cpp @@ -49,6 +49,7 @@ #include "vm.h" #include "types.h" #include "scriptutil.h" +#include "i_system.h" // MACROS ------------------------------------------------------------------ diff --git a/src/doomerrors.h b/src/doomerrors.h index 52bc3c12b..9847120e6 100644 --- a/src/doomerrors.h +++ b/src/doomerrors.h @@ -39,6 +39,7 @@ #include #include #include +#include "doomtype.h" #define MAX_ERRORTEXT 1024 @@ -103,4 +104,7 @@ public: CFatalError(const char *message) : CDoomError(message) {} }; +void I_Error (const char *error, ...) GCCPRINTF(1,2); +void I_FatalError (const char *error, ...) GCCPRINTF(1,2); + #endif //__ERRORS_H__ diff --git a/src/files_decompress.cpp b/src/files_decompress.cpp index b6ba8fbcb..4ff30f791 100644 --- a/src/files_decompress.cpp +++ b/src/files_decompress.cpp @@ -39,7 +39,7 @@ #include #include "files.h" -#include "i_system.h" +#include "doomerrors.h" #include "templates.h" #include "m_misc.h" diff --git a/src/g_doomedmap.cpp b/src/g_doomedmap.cpp index f1a99c1d9..6f99ded13 100644 --- a/src/g_doomedmap.cpp +++ b/src/g_doomedmap.cpp @@ -38,6 +38,7 @@ #include "p_lnspec.h" #include "c_dispatch.h" #include "v_text.h" +#include "doomerrors.h" const char *SpecialMapthingNames[] = { diff --git a/src/g_game.cpp b/src/g_game.cpp index 2f170a52b..fe9404bff 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -73,6 +73,7 @@ #include "dobjgc.h" #include "gi.h" #include "a_dynlight.h" +#include "i_system.h" #include "g_hub.h" #include "g_levellocals.h" diff --git a/src/g_level.cpp b/src/g_level.cpp index c3c26a03e..616877c12 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -46,7 +46,7 @@ #include "w_wad.h" #include "am_map.h" #include "c_dispatch.h" -#include "i_system.h" + #include "p_setup.h" #include "p_local.h" #include "r_sky.h" diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp index e90fa52b5..0826b160a 100644 --- a/src/g_mapinfo.cpp +++ b/src/g_mapinfo.cpp @@ -49,6 +49,7 @@ #include "autosegs.h" #include "g_levellocals.h" #include "events.h" +#include "i_system.h" TArray wadclusterinfos; TArray wadlevelinfos; diff --git a/src/g_statusbar/sbarinfo.cpp b/src/g_statusbar/sbarinfo.cpp index 9da0e107e..60c68448f 100644 --- a/src/g_statusbar/sbarinfo.cpp +++ b/src/g_statusbar/sbarinfo.cpp @@ -47,6 +47,7 @@ #include "gstrings.h" #include "g_levellocals.h" #include "vm.h" +#include "i_system.h""" #define ARTIFLASH_OFFSET (statusBar->invBarOffset+6) enum diff --git a/src/gl_load/gl_interface.cpp b/src/gl_load/gl_interface.cpp index d2dc502db..72806a6a0 100644 --- a/src/gl_load/gl_interface.cpp +++ b/src/gl_load/gl_interface.cpp @@ -27,6 +27,7 @@ */ #include "gl_load/gl_system.h" +#include "doomerrors.h" #include "tarray.h" #include "doomtype.h" #include "m_argv.h" diff --git a/src/hwrenderer/textures/hw_material.h b/src/hwrenderer/textures/hw_material.h index 99f241434..154abcc89 100644 --- a/src/hwrenderer/textures/hw_material.h +++ b/src/hwrenderer/textures/hw_material.h @@ -4,7 +4,7 @@ #include "m_fixed.h" #include "textures/textures.h" -#include "i_system.h" + #include "r_defs.h" EXTERN_CVAR(Bool, gl_precache) diff --git a/src/hwrenderer/utility/hw_clock.cpp b/src/hwrenderer/utility/hw_clock.cpp index 2ac4c48f0..67b38ed16 100644 --- a/src/hwrenderer/utility/hw_clock.cpp +++ b/src/hwrenderer/utility/hw_clock.cpp @@ -32,7 +32,7 @@ ** */ -#include "i_system.h" + #include "g_level.h" #include "c_console.h" #include "c_dispatch.h" diff --git a/src/i_net.cpp b/src/i_net.cpp index 5c74c87ae..4cbf1df23 100644 --- a/src/i_net.cpp +++ b/src/i_net.cpp @@ -61,6 +61,7 @@ #include "d_player.h" #include "st_start.h" #include "m_misc.h" +#include "doomerrors.h" #include "i_net.h" diff --git a/src/m_alloc.cpp b/src/m_alloc.cpp index d08913b85..99f1b0657 100644 --- a/src/m_alloc.cpp +++ b/src/m_alloc.cpp @@ -44,7 +44,7 @@ #include #endif -#include "i_system.h" +#include "doomerrors.h" #include "dobject.h" #ifndef _MSC_VER diff --git a/src/m_argv.cpp b/src/m_argv.cpp index 0a2744e5d..ed2b08f1c 100644 --- a/src/m_argv.cpp +++ b/src/m_argv.cpp @@ -34,6 +34,7 @@ #include #include "m_argv.h" +#include "i_system.h" //=========================================================================== // diff --git a/src/m_misc.cpp b/src/m_misc.cpp index 392ba670d..2bf798b13 100644 --- a/src/m_misc.cpp +++ b/src/m_misc.cpp @@ -53,6 +53,7 @@ #include "i_video.h" #include "v_video.h" +#include "i_system.h" // Data. #include "m_misc.h" diff --git a/src/maploader/maploader.cpp b/src/maploader/maploader.cpp index 20582180b..de52b0424 100644 --- a/src/maploader/maploader.cpp +++ b/src/maploader/maploader.cpp @@ -64,7 +64,7 @@ #include "actor.h" #include "g_levellocals.h" #include "p_lnspec.h" -#include "i_system.h" + #include "v_text.h" #include "p_setup.h" #include "gi.h" diff --git a/src/maploader/udmf.cpp b/src/maploader/udmf.cpp index 4a1688bf7..a35f555b1 100644 --- a/src/maploader/udmf.cpp +++ b/src/maploader/udmf.cpp @@ -36,7 +36,7 @@ #include "doomstat.h" #include "p_setup.h" #include "p_lnspec.h" -#include "i_system.h" + #include "gi.h" #include "r_sky.h" #include "g_level.h" diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp index e023f1f88..c7dc2738e 100644 --- a/src/menu/loadsavemenu.cpp +++ b/src/menu/loadsavemenu.cpp @@ -42,6 +42,7 @@ #include "gstrings.h" #include "serializer.h" #include "vm.h" +#include "i_system.h" // Save name length limit for old binary formats. #define OLDSAVESTRINGSIZE 24 diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp index 43c703900..f085f79b7 100644 --- a/src/menu/menudef.cpp +++ b/src/menu/menudef.cpp @@ -45,7 +45,7 @@ #include "gameconfigfile.h" #include "m_argv.h" #include "i_soundfont.h" - +#include "i_system.h" void ClearSaveGames(); diff --git a/src/nodebuild_utility.cpp b/src/nodebuild_utility.cpp index 0735c299f..ffd5f61e8 100644 --- a/src/nodebuild_utility.cpp +++ b/src/nodebuild_utility.cpp @@ -44,7 +44,7 @@ #include #include "nodebuild.h" -#include "i_system.h" + #include "po_man.h" #include "g_levellocals.h" diff --git a/src/p_acs.h b/src/p_acs.h index 6fae24de9..bbd1001bf 100644 --- a/src/p_acs.h +++ b/src/p_acs.h @@ -37,6 +37,7 @@ #include "doomtype.h" #include "dthinker.h" +#include "doomerrors.h" #define LOCAL_SIZE 20 #define NUM_MAPVARS 128 diff --git a/src/p_effect.cpp b/src/p_effect.cpp index 689191e5b..073d6d9b8 100644 --- a/src/p_effect.cpp +++ b/src/p_effect.cpp @@ -36,7 +36,7 @@ #include "doomtype.h" #include "doomstat.h" -#include "i_system.h" + #include "actor.h" #include "m_argv.h" #include "p_effect.h" diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp index 6997cd738..ade5c445a 100644 --- a/src/p_enemy.cpp +++ b/src/p_enemy.cpp @@ -33,7 +33,7 @@ #include "templates.h" #include "m_random.h" -#include "i_system.h" + #include "doomdef.h" #include "p_local.h" #include "p_maputl.h" diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 94255229d..a8aef7705 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -59,7 +59,7 @@ // HEADER FILES ------------------------------------------------------------ #include #include "templates.h" -#include "i_system.h" + #include "m_random.h" #include "doomdef.h" #include "p_local.h" diff --git a/src/p_openmap.cpp b/src/p_openmap.cpp index 9331dca72..765d91797 100644 --- a/src/p_openmap.cpp +++ b/src/p_openmap.cpp @@ -35,7 +35,7 @@ */ #include "p_setup.h" -#include "i_system.h" + #include "cmdlib.h" #include "w_wad.h" #include "md5.h" diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index d363e08c9..807287f41 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -33,7 +33,7 @@ ** */ -#include "i_system.h" + #include "p_local.h" #include "p_spec.h" diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 3321e6cec..2c5d1551c 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -72,6 +72,7 @@ #include "maploader/maploader.h" #include "p_acs.h" #include "am_map.h" +#include "i_system.h" #include "fragglescript/t_script.h" extern AActor *SpawnMapThing (int index, FMapThing *mthing, int position); diff --git a/src/p_sight.cpp b/src/p_sight.cpp index cb1dc8243..1e4c8155b 100644 --- a/src/p_sight.cpp +++ b/src/p_sight.cpp @@ -23,7 +23,7 @@ #include #include "doomdef.h" -#include "i_system.h" + #include "p_local.h" #include "p_maputl.h" #include "p_blockmap.h" diff --git a/src/p_switch.cpp b/src/p_switch.cpp index 04bca2ca1..375249c5c 100644 --- a/src/p_switch.cpp +++ b/src/p_switch.cpp @@ -33,7 +33,7 @@ */ #include "templates.h" -#include "i_system.h" + #include "doomdef.h" #include "p_local.h" #include "p_lnspec.h" diff --git a/src/polyrenderer/drawers/poly_buffer.cpp b/src/polyrenderer/drawers/poly_buffer.cpp index eb1b5e1e4..d205fe8cc 100644 --- a/src/polyrenderer/drawers/poly_buffer.cpp +++ b/src/polyrenderer/drawers/poly_buffer.cpp @@ -23,7 +23,7 @@ #include #include "templates.h" #include "doomdef.h" -#include "i_system.h" + #include "w_wad.h" #include "v_video.h" #include "doomstat.h" diff --git a/src/polyrenderer/drawers/poly_draw_args.cpp b/src/polyrenderer/drawers/poly_draw_args.cpp index bb31c1515..fe5dd1e8d 100644 --- a/src/polyrenderer/drawers/poly_draw_args.cpp +++ b/src/polyrenderer/drawers/poly_draw_args.cpp @@ -23,7 +23,7 @@ #include #include "templates.h" #include "doomdef.h" -#include "i_system.h" + #include "w_wad.h" #include "v_video.h" #include "doomstat.h" diff --git a/src/polyrenderer/drawers/poly_triangle.cpp b/src/polyrenderer/drawers/poly_triangle.cpp index b0248eceb..9fd779cdc 100644 --- a/src/polyrenderer/drawers/poly_triangle.cpp +++ b/src/polyrenderer/drawers/poly_triangle.cpp @@ -23,7 +23,7 @@ #include #include "templates.h" #include "doomdef.h" -#include "i_system.h" + #include "w_wad.h" #include "v_video.h" #include "doomstat.h" diff --git a/src/polyrenderer/drawers/screen_triangle.cpp b/src/polyrenderer/drawers/screen_triangle.cpp index 151e86a9f..c989a94d1 100644 --- a/src/polyrenderer/drawers/screen_triangle.cpp +++ b/src/polyrenderer/drawers/screen_triangle.cpp @@ -23,7 +23,7 @@ #include #include "templates.h" #include "doomdef.h" -#include "i_system.h" + #include "w_wad.h" #include "v_video.h" #include "doomstat.h" diff --git a/src/polyrenderer/poly_renderthread.cpp b/src/polyrenderer/poly_renderthread.cpp index 3293014f4..ccc8338bf 100644 --- a/src/polyrenderer/poly_renderthread.cpp +++ b/src/polyrenderer/poly_renderthread.cpp @@ -24,7 +24,7 @@ #include "templates.h" #include "doomdef.h" #include "m_bbox.h" -#include "i_system.h" + #include "p_lnspec.h" #include "p_setup.h" #include "a_sharedglobal.h" diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm index 9fe38947b..7f823b628 100644 --- a/src/posix/cocoa/i_main.mm +++ b/src/posix/cocoa/i_main.mm @@ -44,6 +44,7 @@ #include "m_argv.h" #include "st_console.h" #include "version.h" +#include "doomerrors.h" #define ZD_UNUSED(VARIABLE) ((void)(VARIABLE)) diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm index 0746056da..7b20907f2 100644 --- a/src/posix/cocoa/i_video.mm +++ b/src/posix/cocoa/i_video.mm @@ -46,6 +46,7 @@ #include "st_console.h" #include "v_text.h" #include "version.h" +#include "doomerrors.h" #include "gl/renderer/gl_renderer.h" #include "gl/system/gl_framebuffer.h" diff --git a/src/posix/i_system.h b/src/posix/i_system.h index 1ff06a79e..7e6837824 100644 --- a/src/posix/i_system.h +++ b/src/posix/i_system.h @@ -99,9 +99,6 @@ void I_Quit (void); void I_Tactile (int on, int off, int total); -void I_Error (const char *error, ...) GCCPRINTF(1,2); -void I_FatalError (const char *error, ...) GCCPRINTF(1,2); - void addterm (void (*func)(void), const char *name); #define atterm(t) addterm (t, #t) void popterm (); diff --git a/src/posix/sdl/critsec.cpp b/src/posix/sdl/critsec.cpp index 04aa4aa9d..03a6202b9 100644 --- a/src/posix/sdl/critsec.cpp +++ b/src/posix/sdl/critsec.cpp @@ -36,6 +36,7 @@ #include "SDL.h" #include "i_system.h" +#include "doomerrors.h" class FInternalCriticalSection { diff --git a/src/posix/sdl/hardware.cpp b/src/posix/sdl/hardware.cpp index faf1b4988..a26536538 100644 --- a/src/posix/sdl/hardware.cpp +++ b/src/posix/sdl/hardware.cpp @@ -40,6 +40,7 @@ #include "v_text.h" #include "doomstat.h" #include "m_argv.h" +#include "doomerrors.h" #include "swrenderer/r_swrenderer.h" IVideo *Video; diff --git a/src/posix/sdl/i_main.cpp b/src/posix/sdl/i_main.cpp index f7d5da8f3..05b0e6425 100644 --- a/src/posix/sdl/i_main.cpp +++ b/src/posix/sdl/i_main.cpp @@ -53,6 +53,7 @@ #include "r_utility.h" #include "doomstat.h" #include "vm.h" +#include "doomerrors.h" // MACROS ------------------------------------------------------------------ diff --git a/src/posix/unix/i_specialpaths.cpp b/src/posix/unix/i_specialpaths.cpp index 60cc12fcf..b6cba526a 100644 --- a/src/posix/unix/i_specialpaths.cpp +++ b/src/posix/unix/i_specialpaths.cpp @@ -37,6 +37,7 @@ #include #include "i_system.h" #include "cmdlib.h" +#include "doomerrors.h" #include "version.h" // for GAMENAME diff --git a/src/r_data/colormaps.cpp b/src/r_data/colormaps.cpp index d8feac7c7..5c5ed6a3b 100644 --- a/src/r_data/colormaps.cpp +++ b/src/r_data/colormaps.cpp @@ -38,7 +38,7 @@ #include #include -#include "i_system.h" + #include "w_wad.h" #include "r_sky.h" #include "colormaps.h" diff --git a/src/r_data/gldefs.cpp b/src/r_data/gldefs.cpp index e853ed6e4..ae7f11519 100644 --- a/src/r_data/gldefs.cpp +++ b/src/r_data/gldefs.cpp @@ -33,7 +33,7 @@ ** */ #include -#include "i_system.h" + #include "sc_man.h" #include "templates.h" #include "w_wad.h" diff --git a/src/r_data/r_sections.cpp b/src/r_data/r_sections.cpp index 29b518966..5009b58c6 100644 --- a/src/r_data/r_sections.cpp +++ b/src/r_data/r_sections.cpp @@ -23,7 +23,7 @@ #include -#include "i_system.h" + #include "p_local.h" #include "c_dispatch.h" #include "r_defs.h" diff --git a/src/r_data/sprites.cpp b/src/r_data/sprites.cpp index 2a5224b4f..eecb27dd2 100644 --- a/src/r_data/sprites.cpp +++ b/src/r_data/sprites.cpp @@ -23,7 +23,7 @@ #include "doomtype.h" #include "w_wad.h" -#include "i_system.h" + #include "s_sound.h" #include "d_player.h" #include "d_netinf.h" diff --git a/src/r_utility.cpp b/src/r_utility.cpp index ebe1e9ef4..3d314d34c 100644 --- a/src/r_utility.cpp +++ b/src/r_utility.cpp @@ -63,7 +63,7 @@ #include "i_time.h" #include "actorinlines.h" #include "g_game.h" - +#include "i_system.h" // EXTERNAL DATA DECLARATIONS ---------------------------------------------- diff --git a/src/resourcefiles/file_wad.cpp b/src/resourcefiles/file_wad.cpp index c1f5b3fdb..7b8e81bf9 100644 --- a/src/resourcefiles/file_wad.cpp +++ b/src/resourcefiles/file_wad.cpp @@ -37,7 +37,7 @@ #include "v_text.h" #include "w_wad.h" #include "gi.h" -#include "i_system.h" +#include "doomerrors.h" //========================================================================== // diff --git a/src/resourcefiles/file_zip.cpp b/src/resourcefiles/file_zip.cpp index 04430384e..ac7ae7a08 100644 --- a/src/resourcefiles/file_zip.cpp +++ b/src/resourcefiles/file_zip.cpp @@ -40,7 +40,7 @@ #include "v_text.h" #include "w_wad.h" #include "w_zip.h" -#include "i_system.h" + #include "ancientzip.h" #define BUFREADCOMMENT (0x400) diff --git a/src/s_advsound.cpp b/src/s_advsound.cpp index 0f11c18b6..054edd6fb 100644 --- a/src/s_advsound.cpp +++ b/src/s_advsound.cpp @@ -47,6 +47,7 @@ #include "g_levellocals.h" #include "r_data/sprites.h" #include "vm.h" +#include "i_system.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sc_man.cpp b/src/sc_man.cpp index f1b9b9267..7c2aa460a 100644 --- a/src/sc_man.cpp +++ b/src/sc_man.cpp @@ -61,7 +61,7 @@ #include #include #include "doomtype.h" -#include "i_system.h" +#include "doomerrors.h" #include "sc_man.h" #include "w_wad.h" #include "cmdlib.h" diff --git a/src/scripting/vm/jitintern.h b/src/scripting/vm/jitintern.h index 67659e6e0..aa6dbfc09 100644 --- a/src/scripting/vm/jitintern.h +++ b/src/scripting/vm/jitintern.h @@ -1,6 +1,6 @@ #include "jit.h" -#include "i_system.h" + #include "types.h" #include "stats.h" diff --git a/src/scripting/vmthunks.cpp b/src/scripting/vmthunks.cpp index b5fa6a918..e6cf8b3c8 100644 --- a/src/scripting/vmthunks.cpp +++ b/src/scripting/vmthunks.cpp @@ -28,6 +28,7 @@ // //----------------------------------------------------------------------------- +#include #include "vm.h" #include "r_defs.h" #include "g_levellocals.h" diff --git a/src/scriptutil.cpp b/src/scriptutil.cpp index b47eaee4b..5dfbea03c 100644 --- a/src/scriptutil.cpp +++ b/src/scriptutil.cpp @@ -23,7 +23,7 @@ // //----------------------------------------------------------------------------- -#include "i_system.h" + #include "tarray.h" #include "dobject.h" #include "vm.h" diff --git a/src/sound/mididevices/music_fluidsynth_mididevice.cpp b/src/sound/mididevices/music_fluidsynth_mididevice.cpp index 9112e527a..8314107df 100644 --- a/src/sound/mididevices/music_fluidsynth_mididevice.cpp +++ b/src/sound/mididevices/music_fluidsynth_mididevice.cpp @@ -39,6 +39,7 @@ #include "v_text.h" #include "cmdlib.h" #include "i_soundfont.h" +#include "doomerrors.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/mididevices/music_opl_mididevice.cpp b/src/sound/mididevices/music_opl_mididevice.cpp index f5a45ab23..f588618b1 100644 --- a/src/sound/mididevices/music_opl_mididevice.cpp +++ b/src/sound/mididevices/music_opl_mididevice.cpp @@ -38,7 +38,7 @@ #include "i_musicinterns.h" #include "w_wad.h" #include "v_text.h" -#include "i_system.h" +#include "doomerrors.h" #include "opl.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/mididevices/music_opnmidi_mididevice.cpp b/src/sound/mididevices/music_opnmidi_mididevice.cpp index d9f5d6124..60a9e6167 100644 --- a/src/sound/mididevices/music_opnmidi_mididevice.cpp +++ b/src/sound/mididevices/music_opnmidi_mididevice.cpp @@ -36,7 +36,7 @@ #include "i_musicinterns.h" #include "w_wad.h" -#include "i_system.h" +#include "doomerrors.h" #include "opnmidi/opnmidi.h" #include "i_soundfont.h" diff --git a/src/sound/mididevices/music_timiditypp_mididevice.cpp b/src/sound/mididevices/music_timiditypp_mididevice.cpp index d7025dbcf..381551d3a 100644 --- a/src/sound/mididevices/music_timiditypp_mididevice.cpp +++ b/src/sound/mididevices/music_timiditypp_mididevice.cpp @@ -36,7 +36,7 @@ #include "i_musicinterns.h" #include "v_text.h" -#include "i_system.h" +#include "doomerrors.h" #include "timiditypp/timidity.h" #include "timiditypp/instrum.h" diff --git a/src/sound/mididevices/music_wildmidi_mididevice.cpp b/src/sound/mididevices/music_wildmidi_mididevice.cpp index ccb63ebf3..235110044 100644 --- a/src/sound/mididevices/music_wildmidi_mididevice.cpp +++ b/src/sound/mididevices/music_wildmidi_mididevice.cpp @@ -35,7 +35,7 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "i_system.h" +#include "doomerrors.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/mididevices/music_win_mididevice.cpp b/src/sound/mididevices/music_win_mididevice.cpp index b6ddd46a2..e2605297d 100644 --- a/src/sound/mididevices/music_win_mididevice.cpp +++ b/src/sound/mididevices/music_win_mididevice.cpp @@ -42,7 +42,7 @@ #include "templates.h" #include "doomdef.h" #include "m_swap.h" -#include "i_system.h" +#include "doomerrors.h" #ifndef __GNUC__ #include diff --git a/src/sound/musicformats/music_dumb.cpp b/src/sound/musicformats/music_dumb.cpp index 94c7199c6..5ff82f0de 100644 --- a/src/sound/musicformats/music_dumb.cpp +++ b/src/sound/musicformats/music_dumb.cpp @@ -37,7 +37,7 @@ #include #include "i_musicinterns.h" -#include "i_system.h" + #undef CDECL // w32api's windef.h defines this #include "../dumb/include/dumb.h" diff --git a/src/sound/timidity/common.cpp b/src/sound/timidity/common.cpp index 02d10c7e8..448075f39 100644 --- a/src/sound/timidity/common.cpp +++ b/src/sound/timidity/common.cpp @@ -24,7 +24,7 @@ #include #include #include "timidity.h" -#include "i_system.h" +#include "doomerrors.h" namespace Timidity { diff --git a/src/sound/timidity/timidity.cpp b/src/sound/timidity/timidity.cpp index e657466c0..b100a1e5d 100644 --- a/src/sound/timidity/timidity.cpp +++ b/src/sound/timidity/timidity.cpp @@ -28,6 +28,7 @@ #include "cmdlib.h" #include "c_cvars.h" #include "c_dispatch.h" +#include "doomerrors.h" #include "i_system.h" #include "files.h" #include "w_wad.h" diff --git a/src/swrenderer/drawers/r_draw.cpp b/src/swrenderer/drawers/r_draw.cpp index 8dfddb832..4d20ca682 100644 --- a/src/swrenderer/drawers/r_draw.cpp +++ b/src/swrenderer/drawers/r_draw.cpp @@ -36,7 +36,7 @@ #include "templates.h" #include "doomdef.h" -#include "i_system.h" + #include "w_wad.h" #include "v_video.h" #include "doomstat.h" diff --git a/src/swrenderer/drawers/r_draw_rgba.cpp b/src/swrenderer/drawers/r_draw_rgba.cpp index f43831d65..9c3e328cd 100644 --- a/src/swrenderer/drawers/r_draw_rgba.cpp +++ b/src/swrenderer/drawers/r_draw_rgba.cpp @@ -36,7 +36,7 @@ #include "templates.h" #include "doomdef.h" -#include "i_system.h" + #include "w_wad.h" #include "v_video.h" #include "doomstat.h" diff --git a/src/swrenderer/line/r_farclip_line.cpp b/src/swrenderer/line/r_farclip_line.cpp index 5b55e654f..91f2774a2 100644 --- a/src/swrenderer/line/r_farclip_line.cpp +++ b/src/swrenderer/line/r_farclip_line.cpp @@ -21,7 +21,7 @@ #include #include #include "templates.h" -#include "i_system.h" + #include "doomdef.h" #include "doomstat.h" #include "doomdata.h" diff --git a/src/swrenderer/line/r_fogboundary.cpp b/src/swrenderer/line/r_fogboundary.cpp index 8a20b9028..8831e15c4 100644 --- a/src/swrenderer/line/r_fogboundary.cpp +++ b/src/swrenderer/line/r_fogboundary.cpp @@ -23,7 +23,7 @@ #include #include #include "templates.h" -#include "i_system.h" + #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/swrenderer/line/r_line.cpp b/src/swrenderer/line/r_line.cpp index 2b3578437..04d43b3bd 100644 --- a/src/swrenderer/line/r_line.cpp +++ b/src/swrenderer/line/r_line.cpp @@ -23,7 +23,7 @@ #include #include #include "templates.h" -#include "i_system.h" +#include "doomerrors.h" #include "doomdef.h" #include "doomstat.h" #include "doomdata.h" diff --git a/src/swrenderer/line/r_renderdrawsegment.cpp b/src/swrenderer/line/r_renderdrawsegment.cpp index 610641fdf..5758b08ee 100644 --- a/src/swrenderer/line/r_renderdrawsegment.cpp +++ b/src/swrenderer/line/r_renderdrawsegment.cpp @@ -24,7 +24,7 @@ #include "templates.h" #include "doomdef.h" #include "m_bbox.h" -#include "i_system.h" + #include "p_lnspec.h" #include "p_setup.h" #include "a_sharedglobal.h" diff --git a/src/swrenderer/line/r_wallsetup.cpp b/src/swrenderer/line/r_wallsetup.cpp index 168e8425f..f1b2f2518 100644 --- a/src/swrenderer/line/r_wallsetup.cpp +++ b/src/swrenderer/line/r_wallsetup.cpp @@ -23,7 +23,7 @@ #include #include #include "templates.h" -#include "i_system.h" + #include "doomdef.h" #include "doomstat.h" #include "doomdata.h" diff --git a/src/swrenderer/plane/r_flatplane.cpp b/src/swrenderer/plane/r_flatplane.cpp index b75d5c545..278fe3e14 100644 --- a/src/swrenderer/plane/r_flatplane.cpp +++ b/src/swrenderer/plane/r_flatplane.cpp @@ -23,7 +23,7 @@ #include #include #include "templates.h" -#include "i_system.h" +#include "doomerrors.h" #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/swrenderer/plane/r_planerenderer.cpp b/src/swrenderer/plane/r_planerenderer.cpp index bc1eb22f9..5a07a319a 100644 --- a/src/swrenderer/plane/r_planerenderer.cpp +++ b/src/swrenderer/plane/r_planerenderer.cpp @@ -24,7 +24,7 @@ #include #include "templates.h" -#include "i_system.h" + #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/swrenderer/plane/r_skyplane.cpp b/src/swrenderer/plane/r_skyplane.cpp index 223a71b79..a3ddae79b 100644 --- a/src/swrenderer/plane/r_skyplane.cpp +++ b/src/swrenderer/plane/r_skyplane.cpp @@ -23,7 +23,7 @@ #include #include #include "templates.h" -#include "i_system.h" + #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/swrenderer/plane/r_slopeplane.cpp b/src/swrenderer/plane/r_slopeplane.cpp index c143e86c3..e2249a30f 100644 --- a/src/swrenderer/plane/r_slopeplane.cpp +++ b/src/swrenderer/plane/r_slopeplane.cpp @@ -23,7 +23,7 @@ #include #include #include "templates.h" -#include "i_system.h" + #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/swrenderer/plane/r_visibleplane.cpp b/src/swrenderer/plane/r_visibleplane.cpp index a61b6e84d..2d5cf854d 100644 --- a/src/swrenderer/plane/r_visibleplane.cpp +++ b/src/swrenderer/plane/r_visibleplane.cpp @@ -24,7 +24,7 @@ #include #include "templates.h" -#include "i_system.h" + #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/swrenderer/plane/r_visibleplanelist.cpp b/src/swrenderer/plane/r_visibleplanelist.cpp index 3c65e6386..d157bc42a 100644 --- a/src/swrenderer/plane/r_visibleplanelist.cpp +++ b/src/swrenderer/plane/r_visibleplanelist.cpp @@ -24,7 +24,7 @@ #include #include "templates.h" -#include "i_system.h" + #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/swrenderer/r_memory.cpp b/src/swrenderer/r_memory.cpp index 38fc7d868..6e0556edb 100644 --- a/src/swrenderer/r_memory.cpp +++ b/src/swrenderer/r_memory.cpp @@ -22,7 +22,7 @@ #include "templates.h" #include "doomdef.h" #include "m_bbox.h" -#include "i_system.h" + #include "p_lnspec.h" #include "p_setup.h" #include "swrenderer/drawers/r_draw.h" diff --git a/src/swrenderer/r_renderthread.cpp b/src/swrenderer/r_renderthread.cpp index 86e789721..036e29730 100644 --- a/src/swrenderer/r_renderthread.cpp +++ b/src/swrenderer/r_renderthread.cpp @@ -24,7 +24,7 @@ #include "templates.h" #include "doomdef.h" #include "m_bbox.h" -#include "i_system.h" + #include "p_lnspec.h" #include "p_setup.h" #include "a_sharedglobal.h" diff --git a/src/swrenderer/r_swscene.cpp b/src/swrenderer/r_swscene.cpp index 013308bbf..164ffd536 100644 --- a/src/swrenderer/r_swscene.cpp +++ b/src/swrenderer/r_swscene.cpp @@ -34,6 +34,7 @@ #include "textures/bitmap.h" #include "swrenderer/scene/r_light.h" #include "image.h" +#include "doomerrors.h" // [RH] Base blending values (for e.g. underwater) int BaseBlendR, BaseBlendG, BaseBlendB; diff --git a/src/swrenderer/scene/r_light.cpp b/src/swrenderer/scene/r_light.cpp index 0834a990c..0af4723a1 100644 --- a/src/swrenderer/scene/r_light.cpp +++ b/src/swrenderer/scene/r_light.cpp @@ -24,7 +24,7 @@ #include #include "templates.h" -#include "i_system.h" + #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/swrenderer/scene/r_opaque_pass.cpp b/src/swrenderer/scene/r_opaque_pass.cpp index d929a2234..2674e782d 100644 --- a/src/swrenderer/scene/r_opaque_pass.cpp +++ b/src/swrenderer/scene/r_opaque_pass.cpp @@ -34,7 +34,7 @@ #include "m_bbox.h" -#include "i_system.h" +#include "doomerrors.h" #include "p_lnspec.h" #include "p_setup.h" diff --git a/src/swrenderer/scene/r_portal.cpp b/src/swrenderer/scene/r_portal.cpp index d78930e41..3077f3705 100644 --- a/src/swrenderer/scene/r_portal.cpp +++ b/src/swrenderer/scene/r_portal.cpp @@ -38,7 +38,7 @@ #include "v_video.h" #include "stats.h" #include "i_video.h" -#include "i_system.h" + #include "a_sharedglobal.h" #include "r_data/r_translate.h" #include "p_3dmidtex.h" diff --git a/src/swrenderer/scene/r_scene.cpp b/src/swrenderer/scene/r_scene.cpp index 01e696918..fe00fc1b8 100644 --- a/src/swrenderer/scene/r_scene.cpp +++ b/src/swrenderer/scene/r_scene.cpp @@ -23,7 +23,7 @@ #include #include "templates.h" -#include "i_system.h" + #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/swrenderer/scene/r_translucent_pass.cpp b/src/swrenderer/scene/r_translucent_pass.cpp index ba077b9d4..4738af57b 100644 --- a/src/swrenderer/scene/r_translucent_pass.cpp +++ b/src/swrenderer/scene/r_translucent_pass.cpp @@ -26,7 +26,7 @@ #include "templates.h" #include "doomdef.h" #include "m_swap.h" -#include "i_system.h" + #include "w_wad.h" #include "g_levellocals.h" #include "p_maputl.h" diff --git a/src/swrenderer/segments/r_clipsegment.cpp b/src/swrenderer/segments/r_clipsegment.cpp index 5201bc38e..3afb4bab3 100644 --- a/src/swrenderer/segments/r_clipsegment.cpp +++ b/src/swrenderer/segments/r_clipsegment.cpp @@ -23,7 +23,7 @@ #include "templates.h" #include "doomdef.h" #include "m_bbox.h" -#include "i_system.h" + #include "p_lnspec.h" #include "p_setup.h" #include "swrenderer/drawers/r_draw.h" diff --git a/src/swrenderer/segments/r_drawsegment.cpp b/src/swrenderer/segments/r_drawsegment.cpp index a613ce60f..798ee7a3c 100644 --- a/src/swrenderer/segments/r_drawsegment.cpp +++ b/src/swrenderer/segments/r_drawsegment.cpp @@ -23,7 +23,7 @@ #include "templates.h" #include "doomdef.h" #include "m_bbox.h" -#include "i_system.h" + #include "p_lnspec.h" #include "p_setup.h" #include "a_sharedglobal.h" diff --git a/src/swrenderer/segments/r_portalsegment.cpp b/src/swrenderer/segments/r_portalsegment.cpp index a5dcfe7c3..34ed3677d 100644 --- a/src/swrenderer/segments/r_portalsegment.cpp +++ b/src/swrenderer/segments/r_portalsegment.cpp @@ -23,7 +23,7 @@ #include "templates.h" #include "doomdef.h" #include "m_bbox.h" -#include "i_system.h" + #include "p_lnspec.h" #include "p_setup.h" #include "swrenderer/drawers/r_draw.h" diff --git a/src/swrenderer/things/r_decal.cpp b/src/swrenderer/things/r_decal.cpp index 4340358ea..af026276b 100644 --- a/src/swrenderer/things/r_decal.cpp +++ b/src/swrenderer/things/r_decal.cpp @@ -22,7 +22,7 @@ #include #include #include "templates.h" -#include "i_system.h" + #include "doomdef.h" #include "doomstat.h" #include "doomdata.h" diff --git a/src/swrenderer/things/r_particle.cpp b/src/swrenderer/things/r_particle.cpp index 99831a386..220124ae4 100644 --- a/src/swrenderer/things/r_particle.cpp +++ b/src/swrenderer/things/r_particle.cpp @@ -26,7 +26,7 @@ #include "templates.h" #include "doomdef.h" #include "m_swap.h" -#include "i_system.h" + #include "w_wad.h" #include "c_console.h" #include "c_cvars.h" diff --git a/src/swrenderer/things/r_playersprite.cpp b/src/swrenderer/things/r_playersprite.cpp index eb12dbcae..94e127ad1 100644 --- a/src/swrenderer/things/r_playersprite.cpp +++ b/src/swrenderer/things/r_playersprite.cpp @@ -26,7 +26,7 @@ #include "templates.h" #include "doomdef.h" #include "m_swap.h" -#include "i_system.h" + #include "w_wad.h" #include "swrenderer/things/r_playersprite.h" #include "c_console.h" diff --git a/src/swrenderer/things/r_sprite.cpp b/src/swrenderer/things/r_sprite.cpp index fa8ce436d..5c00ed9fd 100644 --- a/src/swrenderer/things/r_sprite.cpp +++ b/src/swrenderer/things/r_sprite.cpp @@ -26,7 +26,7 @@ #include "templates.h" #include "doomdef.h" #include "m_swap.h" -#include "i_system.h" + #include "w_wad.h" #include "swrenderer/things/r_wallsprite.h" #include "c_console.h" diff --git a/src/swrenderer/things/r_visiblesprite.cpp b/src/swrenderer/things/r_visiblesprite.cpp index 9c7e157c8..a2dd22b13 100644 --- a/src/swrenderer/things/r_visiblesprite.cpp +++ b/src/swrenderer/things/r_visiblesprite.cpp @@ -26,7 +26,7 @@ #include "templates.h" #include "doomdef.h" #include "m_swap.h" -#include "i_system.h" + #include "w_wad.h" #include "g_levellocals.h" #include "p_maputl.h" diff --git a/src/swrenderer/things/r_visiblespritelist.cpp b/src/swrenderer/things/r_visiblespritelist.cpp index ca1a40ab5..95a4dfaca 100644 --- a/src/swrenderer/things/r_visiblespritelist.cpp +++ b/src/swrenderer/things/r_visiblespritelist.cpp @@ -26,7 +26,7 @@ #include "templates.h" #include "doomdef.h" #include "m_swap.h" -#include "i_system.h" + #include "w_wad.h" #include "g_levellocals.h" #include "p_maputl.h" diff --git a/src/swrenderer/things/r_wallsprite.cpp b/src/swrenderer/things/r_wallsprite.cpp index 15d600b5f..3a6e60a0f 100644 --- a/src/swrenderer/things/r_wallsprite.cpp +++ b/src/swrenderer/things/r_wallsprite.cpp @@ -26,7 +26,7 @@ #include "templates.h" #include "doomdef.h" #include "m_swap.h" -#include "i_system.h" + #include "w_wad.h" #include "swrenderer/things/r_wallsprite.h" #include "c_console.h" diff --git a/src/swrenderer/viewport/r_viewport.cpp b/src/swrenderer/viewport/r_viewport.cpp index 2e39b1d3d..76a46bed3 100644 --- a/src/swrenderer/viewport/r_viewport.cpp +++ b/src/swrenderer/viewport/r_viewport.cpp @@ -23,7 +23,7 @@ #include #include "templates.h" -#include "i_system.h" + #include "w_wad.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/teaminfo.cpp b/src/teaminfo.cpp index bde80a431..5a70429e0 100644 --- a/src/teaminfo.cpp +++ b/src/teaminfo.cpp @@ -36,7 +36,7 @@ #include "c_dispatch.h" #include "gi.h" -#include "i_system.h" + #include "teaminfo.h" #include "v_font.h" #include "v_video.h" diff --git a/src/textures/animations.cpp b/src/textures/animations.cpp index 031a940e7..644718bc4 100644 --- a/src/textures/animations.cpp +++ b/src/textures/animations.cpp @@ -34,7 +34,7 @@ #include "doomtype.h" #include "cmdlib.h" -#include "i_system.h" +#include "doomerrors.h" #include "r_sky.h" #include "m_random.h" #include "d_player.h" diff --git a/src/textures/formats/brightmaptexture.cpp b/src/textures/formats/brightmaptexture.cpp index d56f06010..b9baf2383 100644 --- a/src/textures/formats/brightmaptexture.cpp +++ b/src/textures/formats/brightmaptexture.cpp @@ -35,7 +35,7 @@ #include "doomtype.h" #include "w_wad.h" -#include "i_system.h" + #include "r_data/r_translate.h" #include "bitmap.h" #include "v_video.h" diff --git a/src/textures/formats/fontchars.cpp b/src/textures/formats/fontchars.cpp index afb643487..6ff30ab8c 100644 --- a/src/textures/formats/fontchars.cpp +++ b/src/textures/formats/fontchars.cpp @@ -42,6 +42,7 @@ #include "image.h" #include "imagehelpers.h" #include "fontchars.h" +#include "doomerrors.h" //========================================================================== // diff --git a/src/textures/formats/multipatchtexture.cpp b/src/textures/formats/multipatchtexture.cpp index 165a49344..8166db645 100644 --- a/src/textures/formats/multipatchtexture.cpp +++ b/src/textures/formats/multipatchtexture.cpp @@ -37,7 +37,7 @@ #include "doomtype.h" #include "files.h" #include "w_wad.h" -#include "i_system.h" + #include "gi.h" #include "st_start.h" #include "sc_man.h" diff --git a/src/textures/multipatchtexturebuilder.cpp b/src/textures/multipatchtexturebuilder.cpp index 4675220f5..0bc822a05 100644 --- a/src/textures/multipatchtexturebuilder.cpp +++ b/src/textures/multipatchtexturebuilder.cpp @@ -38,7 +38,7 @@ #include "doomtype.h" #include "files.h" #include "w_wad.h" -#include "i_system.h" + #include "gi.h" #include "st_start.h" #include "sc_man.h" diff --git a/src/textures/texture.cpp b/src/textures/texture.cpp index 6d8dc0198..85d319ffc 100644 --- a/src/textures/texture.cpp +++ b/src/textures/texture.cpp @@ -38,7 +38,7 @@ #include "files.h" #include "w_wad.h" #include "templates.h" -#include "i_system.h" + #include "r_data/r_translate.h" #include "bitmap.h" #include "colormatcher.h" diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp index 1c535f4df..f68f0d478 100644 --- a/src/textures/texturemanager.cpp +++ b/src/textures/texturemanager.cpp @@ -38,7 +38,7 @@ #include "doomstat.h" #include "w_wad.h" #include "templates.h" -#include "i_system.h" + #include "r_data/r_translate.h" #include "r_data/sprites.h" #include "c_dispatch.h" diff --git a/src/v_framebuffer.cpp b/src/v_framebuffer.cpp index 722596c35..26a86623a 100644 --- a/src/v_framebuffer.cpp +++ b/src/v_framebuffer.cpp @@ -34,7 +34,7 @@ #include -#include "i_system.h" + #include "x86.h" #include "actor.h" diff --git a/src/v_pfx.cpp b/src/v_pfx.cpp index 884a9c7a4..14a50c7c9 100644 --- a/src/v_pfx.cpp +++ b/src/v_pfx.cpp @@ -33,7 +33,7 @@ */ #include "doomtype.h" -#include "i_system.h" +#include "doomerrors.h" #include "v_pfx.h" PfxUnion GPfxPal; diff --git a/src/v_text.cpp b/src/v_text.cpp index a6d57399b..345f4b731 100644 --- a/src/v_text.cpp +++ b/src/v_text.cpp @@ -39,7 +39,7 @@ #include "v_text.h" -#include "i_system.h" + #include "v_video.h" #include "w_wad.h" diff --git a/src/v_video.cpp b/src/v_video.cpp index 6e0299bbb..8c8dccf97 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -36,6 +36,7 @@ #include #include "i_system.h" +#include "c_cvars.h" #include "x86.h" #include "i_video.h" #include "r_state.h" diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp index 87edc0398..e5da62553 100644 --- a/src/wi_stuff.cpp +++ b/src/wi_stuff.cpp @@ -37,7 +37,7 @@ #include "m_random.h" #include "m_swap.h" -#include "i_system.h" + #include "w_wad.h" #include "g_level.h" #include "s_sound.h" diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp index aa5671f28..29ee60aa7 100644 --- a/src/win32/hardware.cpp +++ b/src/win32/hardware.cpp @@ -44,6 +44,8 @@ #include "m_argv.h" #include "version.h" #include "win32glvideo.h" +#include "doomerrors.h" +#include "i_system.h" #include "swrenderer/r_swrenderer.h" EXTERN_CVAR(Int, vid_maxfps) diff --git a/src/win32/i_cd.cpp b/src/win32/i_cd.cpp index f6139e96f..c8dcc3d62 100644 --- a/src/win32/i_cd.cpp +++ b/src/win32/i_cd.cpp @@ -42,6 +42,7 @@ #include "c_cvars.h" #include "m_argv.h" #include "version.h" +#include "i_system.h" #include "i_cd.h" #include "helperthread.h" diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp index 85bc3abef..e43c9c8bb 100644 --- a/src/win32/i_input.cpp +++ b/src/win32/i_input.cpp @@ -89,6 +89,8 @@ #include "v_text.h" #include "version.h" #include "events.h" +#include "doomerrors.h" +#include "i_system.h" // Prototypes and declarations. #include "rawinput.h" diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp index 40115490c..2a35242d6 100644 --- a/src/win32/i_main.cpp +++ b/src/win32/i_main.cpp @@ -72,6 +72,7 @@ #include "g_levellocals.h" #include "s_sound.h" #include "vm.h" +#include "i_system.h" #include "stats.h" #include "st_start.h" diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index 45bb50b4d..bc0fb865b 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -80,6 +80,7 @@ #include "v_font.h" #include "g_level.h" #include "doomstat.h" +#include "i_system.h" #include "textures/bitmap.h" #include "optwin32.h" diff --git a/src/win32/i_system.h b/src/win32/i_system.h index 903203daf..59551a865 100644 --- a/src/win32/i_system.h +++ b/src/win32/i_system.h @@ -91,9 +91,6 @@ void I_Quit (void); void I_Tactile (int on, int off, int total); -void I_Error (const char *error, ...) GCCPRINTF(1,2); -void I_FatalError (const char *error, ...) GCCPRINTF(1,2); - void atterm (void (*func)(void)); void popterm (); diff --git a/src/win32/st_start.cpp b/src/win32/st_start.cpp index 549ccad1c..c2a0d5941 100644 --- a/src/win32/st_start.cpp +++ b/src/win32/st_start.cpp @@ -50,6 +50,7 @@ #include "s_sound.h" #include "m_argv.h" #include "d_main.h" +#include "doomerrors.h" // MACROS ------------------------------------------------------------------