From e48fce5744c5410ca04f4fb5212cfc3485ca1c5f Mon Sep 17 00:00:00 2001 From: Brad Harding Date: Sat, 12 Oct 2024 13:49:55 +1100 Subject: [PATCH] Revert "Remove some more #include directives" This reverts commit 466b5c8064756e4643de259b4a34fa1410dcd84f. --- src/c_cmds.h | 1 + src/c_console.h | 1 + src/d_event.h | 2 ++ src/d_items.h | 1 + src/d_iwad.h | 3 +++ src/doomdef.h | 2 +- src/g_game.h | 1 + src/i_system.h | 1 + src/i_winmusic.h | 2 ++ src/info.h | 1 + src/m_fixed.h | 1 + src/mus2mid.h | 1 + src/p_pspr.h | 4 ++++ src/r_data.h | 1 + src/v_video.h | 1 + 15 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/c_cmds.h b/src/c_cmds.h index e18f739e8..c4d18186f 100644 --- a/src/c_cmds.h +++ b/src/c_cmds.h @@ -35,6 +35,7 @@ #pragma once +#include "doomtype.h" #include "m_config.h" #define MAXALIASES 256 diff --git a/src/c_console.h b/src/c_console.h index e88a4500c..7708d528c 100644 --- a/src/c_console.h +++ b/src/c_console.h @@ -37,6 +37,7 @@ #include "d_event.h" #include "doomdef.h" +#include "doomtype.h" #include "hu_lib.h" #include "r_defs.h" diff --git a/src/d_event.h b/src/d_event.h index 45ee1ba10..b57b8544e 100644 --- a/src/d_event.h +++ b/src/d_event.h @@ -35,6 +35,8 @@ #pragma once +#include "i_video.h" + // // Event handling. // diff --git a/src/d_items.h b/src/d_items.h index 10ee9ee68..d194ac332 100644 --- a/src/d_items.h +++ b/src/d_items.h @@ -36,6 +36,7 @@ #pragma once #include "doomdef.h" +#include "doomtype.h" #include "r_defs.h" #include "sounds.h" diff --git a/src/d_iwad.h b/src/d_iwad.h index 9ab0db15c..ae07eb4e2 100644 --- a/src/d_iwad.h +++ b/src/d_iwad.h @@ -35,6 +35,9 @@ #pragma once +#include "doomdef.h" +#include "w_file.h" + extern char screenshotfolder[MAX_PATH]; char *D_FindWADByName(char *filename); diff --git a/src/doomdef.h b/src/doomdef.h index ad6d91820..82a3e8a16 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -36,11 +36,11 @@ #pragma once #include - #if !defined(_WIN32) #include #endif +#include "doomtype.h" #include "i_video.h" #include "m_controls.h" diff --git a/src/g_game.h b/src/g_game.h index 0615daf8b..af4d91ffe 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -37,6 +37,7 @@ #include "d_event.h" #include "i_video.h" +#include "w_file.h" #define NUMKEYS 512 diff --git a/src/i_system.h b/src/i_system.h index 5284461c7..496c9a54a 100644 --- a/src/i_system.h +++ b/src/i_system.h @@ -35,6 +35,7 @@ #pragma once +#include "d_event.h" #include "doomdef.h" #include "m_misc.h" diff --git a/src/i_winmusic.h b/src/i_winmusic.h index 35596dac0..642cacdd7 100644 --- a/src/i_winmusic.h +++ b/src/i_winmusic.h @@ -37,6 +37,8 @@ #pragma once +#include "doomtype.h" + bool I_Windows_InitMusic(void); void I_Windows_PlaySong(bool looping); void I_Windows_PauseSong(void); diff --git a/src/info.h b/src/info.h index 96929a948..26572b6e6 100644 --- a/src/info.h +++ b/src/info.h @@ -36,6 +36,7 @@ #pragma once #include "doomtype.h" +#include "d_think.h" #include "states.h" #define NO_ALTSPEED -1 diff --git a/src/m_fixed.h b/src/m_fixed.h index 670c12519..c0267219d 100644 --- a/src/m_fixed.h +++ b/src/m_fixed.h @@ -36,6 +36,7 @@ #pragma once #include "doomdef.h" +#include "doomtype.h" #undef ABS #undef MIN diff --git a/src/mus2mid.h b/src/mus2mid.h index 3e128b218..4d1acec19 100644 --- a/src/mus2mid.h +++ b/src/mus2mid.h @@ -35,6 +35,7 @@ #pragma once +#include "doomtype.h" #include "memio.h" bool mus2mid(MEMFILE *musinput, MEMFILE *midioutput); diff --git a/src/p_pspr.h b/src/p_pspr.h index 89fd3e583..b3d57f088 100644 --- a/src/p_pspr.h +++ b/src/p_pspr.h @@ -35,6 +35,10 @@ #pragma once +// Basic data types. +// Needs fixed point, and BAM angles. +#include "tables.h" + // // Needs to include the precompiled // sprite animation tables. diff --git a/src/r_data.h b/src/r_data.h index 0892e66f1..b85c1b966 100644 --- a/src/r_data.h +++ b/src/r_data.h @@ -35,6 +35,7 @@ #pragma once +#include "r_defs.h" #include "r_patch.h" #include "r_state.h" diff --git a/src/v_video.h b/src/v_video.h index cc19d869b..d135b8562 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -36,6 +36,7 @@ #pragma once #include "r_data.h" +#include "w_file.h" // // VIDEO