- moved the I_Error prototypes to doomerrors.h to avoid having to include the low level system header for this.

This commit is contained in:
Christoph Oelckers 2019-01-31 19:38:04 +01:00
parent 1dcdfec733
commit f6a91e1722
121 changed files with 123 additions and 91 deletions

View file

@ -47,7 +47,6 @@
#include "c_dispatch.h"
#include "i_system.h"
#include "doomerrors.h"
#include "doomstat.h"
#include "gstrings.h"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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)

View file

@ -32,7 +32,7 @@
**
*/
#include "i_system.h"
#include "d_protocol.h"
#include "d_net.h"
#include "doomstat.h"

View file

@ -37,7 +37,7 @@
#include <stdlib.h>
#include <type_traits>
#include "doomtype.h"
#include "i_system.h"
#include "vectors.h"
class PClass;

View file

@ -49,6 +49,7 @@
#include "vm.h"
#include "types.h"
#include "scriptutil.h"
#include "i_system.h"
// MACROS ------------------------------------------------------------------

View file

@ -39,6 +39,7 @@
#include <stdio.h>
#include <exception>
#include <stdexcept>
#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__

View file

@ -39,7 +39,7 @@
#include <bzlib.h>
#include "files.h"
#include "i_system.h"
#include "doomerrors.h"
#include "templates.h"
#include "m_misc.h"

View file

@ -38,6 +38,7 @@
#include "p_lnspec.h"
#include "c_dispatch.h"
#include "v_text.h"
#include "doomerrors.h"
const char *SpecialMapthingNames[] = {

View file

@ -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"

View file

@ -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"

View file

@ -49,6 +49,7 @@
#include "autosegs.h"
#include "g_levellocals.h"
#include "events.h"
#include "i_system.h"
TArray<cluster_info_t> wadclusterinfos;
TArray<level_info_t> wadlevelinfos;

View file

@ -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

View file

@ -27,6 +27,7 @@
*/
#include "gl_load/gl_system.h"
#include "doomerrors.h"
#include "tarray.h"
#include "doomtype.h"
#include "m_argv.h"

View file

@ -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)

View file

@ -32,7 +32,7 @@
**
*/
#include "i_system.h"
#include "g_level.h"
#include "c_console.h"
#include "c_dispatch.h"

View file

@ -61,6 +61,7 @@
#include "d_player.h"
#include "st_start.h"
#include "m_misc.h"
#include "doomerrors.h"
#include "i_net.h"

View file

@ -44,7 +44,7 @@
#include <malloc.h>
#endif
#include "i_system.h"
#include "doomerrors.h"
#include "dobject.h"
#ifndef _MSC_VER

View file

@ -34,6 +34,7 @@
#include <string.h>
#include "m_argv.h"
#include "i_system.h"
//===========================================================================
//

View file

@ -53,6 +53,7 @@
#include "i_video.h"
#include "v_video.h"
#include "i_system.h"
// Data.
#include "m_misc.h"

View file

@ -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"

View file

@ -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"

View file

@ -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

View file

@ -45,7 +45,7 @@
#include "gameconfigfile.h"
#include "m_argv.h"
#include "i_soundfont.h"
#include "i_system.h"
void ClearSaveGames();

View file

@ -44,7 +44,7 @@
#include <string.h>
#include "nodebuild.h"
#include "i_system.h"
#include "po_man.h"
#include "g_levellocals.h"

View file

@ -37,6 +37,7 @@
#include "doomtype.h"
#include "dthinker.h"
#include "doomerrors.h"
#define LOCAL_SIZE 20
#define NUM_MAPVARS 128

View file

@ -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"

View file

@ -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"

View file

@ -59,7 +59,7 @@
// HEADER FILES ------------------------------------------------------------
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "m_random.h"
#include "doomdef.h"
#include "p_local.h"

View file

@ -35,7 +35,7 @@
*/
#include "p_setup.h"
#include "i_system.h"
#include "cmdlib.h"
#include "w_wad.h"
#include "md5.h"

View file

@ -33,7 +33,7 @@
**
*/
#include "i_system.h"
#include "p_local.h"
#include "p_spec.h"

View file

@ -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);

View file

@ -23,7 +23,7 @@
#include <assert.h>
#include "doomdef.h"
#include "i_system.h"
#include "p_local.h"
#include "p_maputl.h"
#include "p_blockmap.h"

View file

@ -33,7 +33,7 @@
*/
#include "templates.h"
#include "i_system.h"
#include "doomdef.h"
#include "p_local.h"
#include "p_lnspec.h"

View file

@ -23,7 +23,7 @@
#include <stddef.h>
#include "templates.h"
#include "doomdef.h"
#include "i_system.h"
#include "w_wad.h"
#include "v_video.h"
#include "doomstat.h"

View file

@ -23,7 +23,7 @@
#include <stddef.h>
#include "templates.h"
#include "doomdef.h"
#include "i_system.h"
#include "w_wad.h"
#include "v_video.h"
#include "doomstat.h"

View file

@ -23,7 +23,7 @@
#include <stddef.h>
#include "templates.h"
#include "doomdef.h"
#include "i_system.h"
#include "w_wad.h"
#include "v_video.h"
#include "doomstat.h"

View file

@ -23,7 +23,7 @@
#include <stddef.h>
#include "templates.h"
#include "doomdef.h"
#include "i_system.h"
#include "w_wad.h"
#include "v_video.h"
#include "doomstat.h"

View file

@ -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"

View file

@ -44,6 +44,7 @@
#include "m_argv.h"
#include "st_console.h"
#include "version.h"
#include "doomerrors.h"
#define ZD_UNUSED(VARIABLE) ((void)(VARIABLE))

View file

@ -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"

View file

@ -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 ();

View file

@ -36,6 +36,7 @@
#include "SDL.h"
#include "i_system.h"
#include "doomerrors.h"
class FInternalCriticalSection
{

View file

@ -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;

View file

@ -53,6 +53,7 @@
#include "r_utility.h"
#include "doomstat.h"
#include "vm.h"
#include "doomerrors.h"
// MACROS ------------------------------------------------------------------

View file

@ -37,6 +37,7 @@
#include <sys/types.h>
#include "i_system.h"
#include "cmdlib.h"
#include "doomerrors.h"
#include "version.h" // for GAMENAME

View file

@ -38,7 +38,7 @@
#include <math.h>
#include <float.h>
#include "i_system.h"
#include "w_wad.h"
#include "r_sky.h"
#include "colormaps.h"

View file

@ -33,7 +33,7 @@
**
*/
#include <ctype.h>
#include "i_system.h"
#include "sc_man.h"
#include "templates.h"
#include "w_wad.h"

View file

@ -23,7 +23,7 @@
#include <future>
#include "i_system.h"
#include "p_local.h"
#include "c_dispatch.h"
#include "r_defs.h"

View file

@ -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"

View file

@ -63,7 +63,7 @@
#include "i_time.h"
#include "actorinlines.h"
#include "g_game.h"
#include "i_system.h"
// EXTERNAL DATA DECLARATIONS ----------------------------------------------

View file

@ -37,7 +37,7 @@
#include "v_text.h"
#include "w_wad.h"
#include "gi.h"
#include "i_system.h"
#include "doomerrors.h"
//==========================================================================
//

View file

@ -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)

View file

@ -47,6 +47,7 @@
#include "g_levellocals.h"
#include "r_data/sprites.h"
#include "vm.h"
#include "i_system.h"
// MACROS ------------------------------------------------------------------

View file

@ -61,7 +61,7 @@
#include <string.h>
#include <stdlib.h>
#include "doomtype.h"
#include "i_system.h"
#include "doomerrors.h"
#include "sc_man.h"
#include "w_wad.h"
#include "cmdlib.h"

View file

@ -1,6 +1,6 @@
#include "jit.h"
#include "i_system.h"
#include "types.h"
#include "stats.h"

View file

@ -28,6 +28,7 @@
//
//-----------------------------------------------------------------------------
#include <time.h>
#include "vm.h"
#include "r_defs.h"
#include "g_levellocals.h"

View file

@ -23,7 +23,7 @@
//
//-----------------------------------------------------------------------------
#include "i_system.h"
#include "tarray.h"
#include "dobject.h"
#include "vm.h"

View file

@ -39,6 +39,7 @@
#include "v_text.h"
#include "cmdlib.h"
#include "i_soundfont.h"
#include "doomerrors.h"
// MACROS ------------------------------------------------------------------

View file

@ -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 ------------------------------------------------------------------

View file

@ -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"

View file

@ -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"

View file

@ -35,7 +35,7 @@
// HEADER FILES ------------------------------------------------------------
#include "i_musicinterns.h"
#include "i_system.h"
#include "doomerrors.h"
// MACROS ------------------------------------------------------------------

View file

@ -42,7 +42,7 @@
#include "templates.h"
#include "doomdef.h"
#include "m_swap.h"
#include "i_system.h"
#include "doomerrors.h"
#ifndef __GNUC__
#include <mmdeviceapi.h>

View file

@ -37,7 +37,7 @@
#include <math.h>
#include "i_musicinterns.h"
#include "i_system.h"
#undef CDECL // w32api's windef.h defines this
#include "../dumb/include/dumb.h"

View file

@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "timidity.h"
#include "i_system.h"
#include "doomerrors.h"
namespace Timidity
{

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -21,7 +21,7 @@
#include <stdlib.h>
#include <stddef.h>
#include "templates.h"
#include "i_system.h"
#include "doomdef.h"
#include "doomstat.h"
#include "doomdata.h"

View file

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "w_wad.h"
#include "doomdef.h"
#include "doomstat.h"

View file

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <stddef.h>
#include "templates.h"
#include "i_system.h"
#include "doomerrors.h"
#include "doomdef.h"
#include "doomstat.h"
#include "doomdata.h"

View file

@ -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"

View file

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <stddef.h>
#include "templates.h"
#include "i_system.h"
#include "doomdef.h"
#include "doomstat.h"
#include "doomdata.h"

View file

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "doomerrors.h"
#include "w_wad.h"
#include "doomdef.h"
#include "doomstat.h"

View file

@ -24,7 +24,7 @@
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "w_wad.h"
#include "doomdef.h"
#include "doomstat.h"

View file

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "w_wad.h"
#include "doomdef.h"
#include "doomstat.h"

View file

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "w_wad.h"
#include "doomdef.h"
#include "doomstat.h"

View file

@ -24,7 +24,7 @@
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "w_wad.h"
#include "doomdef.h"
#include "doomstat.h"

View file

@ -24,7 +24,7 @@
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "w_wad.h"
#include "doomdef.h"
#include "doomstat.h"

View file

@ -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"

View file

@ -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"

View file

@ -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;

View file

@ -24,7 +24,7 @@
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "w_wad.h"
#include "doomdef.h"
#include "doomstat.h"

View file

@ -34,7 +34,7 @@
#include "m_bbox.h"
#include "i_system.h"
#include "doomerrors.h"
#include "p_lnspec.h"
#include "p_setup.h"

View file

@ -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"

View file

@ -23,7 +23,7 @@
#include <float.h>
#include "templates.h"
#include "i_system.h"
#include "w_wad.h"
#include "doomdef.h"
#include "doomstat.h"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -22,7 +22,7 @@
#include <stdlib.h>
#include <stddef.h>
#include "templates.h"
#include "i_system.h"
#include "doomdef.h"
#include "doomstat.h"
#include "doomdata.h"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

Some files were not shown because too many files have changed in this diff Show more