From e3eaa5964de0c0c81ab0b4276b0e6eed331f90b3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 1 Feb 2019 00:30:21 +0100 Subject: [PATCH] - removed v_video.h include from portals.h This has no business in a play related file which also made no use of it. --- src/actor.h | 1 + src/am_map.cpp | 1 + src/c_cmds.cpp | 1 + src/c_cvars.cpp | 2 +- src/ct_chat.cpp | 1 + src/menu/menu.cpp | 1 + src/menu/menudef.cpp | 1 + src/p_conversation.cpp | 1 + src/p_setup.cpp | 1 + src/p_user.cpp | 1 + src/portal.h | 1 - src/r_data/gldefs.cpp | 1 + src/rendering/gl/system/gl_buffers.cpp | 1 + src/rendering/hwrenderer/data/flatvertices.cpp | 1 + src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp | 1 + src/rendering/hwrenderer/models/hw_models.h | 1 + src/rendering/hwrenderer/scene/hw_skydome.h | 1 + src/rendering/hwrenderer/textures/hw_precache.cpp | 1 + src/scripting/backend/codegen.cpp | 1 + src/scripting/decorate/thingdef_parse.cpp | 1 + src/scripting/thingdef_properties.cpp | 1 + src/scripting/vmthunks.cpp | 1 + src/scripting/zscript/zcc_compile.cpp | 1 + 23 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/actor.h b/src/actor.h index 3394789fb..c82b5de75 100644 --- a/src/actor.h +++ b/src/actor.h @@ -55,6 +55,7 @@ struct visstyle_t; class FLightDefaults; struct FSection; struct FLevelLocals; +struct FDynamicLight; // // NOTES: AActor // diff --git a/src/am_map.cpp b/src/am_map.cpp index 4a5520a9e..795840218 100644 --- a/src/am_map.cpp +++ b/src/am_map.cpp @@ -47,6 +47,7 @@ #include "d_player.h" #include "p_blockmap.h" #include "g_game.h" +#include "v_video.h" #include "m_cheat.h" #include "c_dispatch.h" diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp index 995677209..44ddbe3e4 100644 --- a/src/c_cmds.cpp +++ b/src/c_cmds.cpp @@ -67,6 +67,7 @@ #include "r_utility.h" #include "c_functions.h" #include "g_levellocals.h" +#include "v_video.h" extern FILE *Logfile; extern bool insave; diff --git a/src/c_cvars.cpp b/src/c_cvars.cpp index 667e811a0..bda309361 100644 --- a/src/c_cvars.cpp +++ b/src/c_cvars.cpp @@ -42,7 +42,7 @@ #include "g_game.h" #include "d_player.h" - +#include "v_video.h" #include "d_netinf.h" #include "menu/menu.h" diff --git a/src/ct_chat.cpp b/src/ct_chat.cpp index 5a8878eb2..31dd40f8a 100644 --- a/src/ct_chat.cpp +++ b/src/ct_chat.cpp @@ -38,6 +38,7 @@ #include "d_net.h" #include "d_event.h" #include "sbar.h" +#include "v_video.h" #define QUEUESIZE 128 #define MESSAGESIZE 128 diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp index a61733a2d..6689f771b 100644 --- a/src/menu/menu.cpp +++ b/src/menu/menu.cpp @@ -51,6 +51,7 @@ #include "menu/menu.h" #include "vm.h" #include "events.h" +#include "v_video.h" #include "scripting/types.h" int DMenu::InMenu; diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp index f085f79b7..409db4ba3 100644 --- a/src/menu/menudef.cpp +++ b/src/menu/menudef.cpp @@ -46,6 +46,7 @@ #include "m_argv.h" #include "i_soundfont.h" #include "i_system.h" +#include "v_video.h" void ClearSaveGames(); diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index e2185104a..ff5f8241e 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -55,6 +55,7 @@ #include "menu/menu.h" #include "g_levellocals.h" #include "vm.h" +#include "v_video.h" #include "actorinlines.h" // The conversations as they exist inside a SCRIPTxx lump. diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 2c5d1551c..20655a223 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -73,6 +73,7 @@ #include "p_acs.h" #include "am_map.h" #include "i_system.h" +#include "v_video.h" #include "fragglescript/t_script.h" extern AActor *SpawnMapThing (int index, FMapThing *mthing, int position); diff --git a/src/p_user.cpp b/src/p_user.cpp index 487a68806..a7ad96c27 100644 --- a/src/p_user.cpp +++ b/src/p_user.cpp @@ -90,6 +90,7 @@ #include "p_acs.h" #include "events.h" #include "g_game.h" +#include "v_video.h" static FRandom pr_skullpop ("SkullPop"); diff --git a/src/portal.h b/src/portal.h index 58093476f..b5e2b7a1b 100644 --- a/src/portal.h +++ b/src/portal.h @@ -2,7 +2,6 @@ #define _PORTALS_H_ #include "basictypes.h" -#include "v_video.h" #include "m_bbox.h" struct FPortalGroupArray; diff --git a/src/r_data/gldefs.cpp b/src/r_data/gldefs.cpp index ae7f11519..be4645699 100644 --- a/src/r_data/gldefs.cpp +++ b/src/r_data/gldefs.cpp @@ -43,6 +43,7 @@ #include "v_text.h" #include "g_levellocals.h" #include "a_dynlight.h" +#include "v_video.h" #include "textures/skyboxtexture.h" #include "hwrenderer/postprocessing/hw_postprocessshader.h" #include "hwrenderer/textures/hw_material.h" diff --git a/src/rendering/gl/system/gl_buffers.cpp b/src/rendering/gl/system/gl_buffers.cpp index 39535fd03..6306f1033 100644 --- a/src/rendering/gl/system/gl_buffers.cpp +++ b/src/rendering/gl/system/gl_buffers.cpp @@ -27,6 +27,7 @@ #include "gl_load/gl_system.h" #include "gl_buffers.h" #include "gl/renderer/gl_renderstate.h" +#include "v_video.h" namespace OpenGLRenderer { diff --git a/src/rendering/hwrenderer/data/flatvertices.cpp b/src/rendering/hwrenderer/data/flatvertices.cpp index d185240fb..2d956e5e2 100644 --- a/src/rendering/hwrenderer/data/flatvertices.cpp +++ b/src/rendering/hwrenderer/data/flatvertices.cpp @@ -31,6 +31,7 @@ #include "c_cvars.h" #include "g_levellocals.h" #include "flatvertices.h" +#include "v_video.h" #include "cmdlib.h" #include "hwrenderer/data/buffers.h" #include "hwrenderer/scene/hw_renderstate.h" diff --git a/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp b/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp index 5bed01063..74a60a452 100644 --- a/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp +++ b/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp @@ -26,6 +26,7 @@ #include "hwrenderer/data/buffers.h" #include "stats.h" #include "g_levellocals.h" +#include "v_video.h" /* The 1D shadow maps are stored in a 1024x1024 texture as float depth values (R32F). diff --git a/src/rendering/hwrenderer/models/hw_models.h b/src/rendering/hwrenderer/models/hw_models.h index 4d2086acf..e3ee0b6a7 100644 --- a/src/rendering/hwrenderer/models/hw_models.h +++ b/src/rendering/hwrenderer/models/hw_models.h @@ -26,6 +26,7 @@ #include "p_pspr.h" #include "r_data/voxels.h" #include "r_data/models/models.h" +#include "hwrenderer/data/buffers.h" class GLSprite; struct HWDrawInfo; diff --git a/src/rendering/hwrenderer/scene/hw_skydome.h b/src/rendering/hwrenderer/scene/hw_skydome.h index 8f2c9ca8d..fc850aeeb 100644 --- a/src/rendering/hwrenderer/scene/hw_skydome.h +++ b/src/rendering/hwrenderer/scene/hw_skydome.h @@ -2,6 +2,7 @@ #include "v_palette.h" #include "r_data/matrix.h" +#include "hwrenderer/data/buffers.h" class FMaterial; class FRenderState; diff --git a/src/rendering/hwrenderer/textures/hw_precache.cpp b/src/rendering/hwrenderer/textures/hw_precache.cpp index dc6829dd6..3a1ea46c6 100644 --- a/src/rendering/hwrenderer/textures/hw_precache.cpp +++ b/src/rendering/hwrenderer/textures/hw_precache.cpp @@ -34,6 +34,7 @@ #include "textures/skyboxtexture.h" #include "hwrenderer/textures/hw_material.h" #include "image.h" +#include "v_video.h" //========================================================================== diff --git a/src/scripting/backend/codegen.cpp b/src/scripting/backend/codegen.cpp index 6b5a4b9f8..495518f18 100644 --- a/src/scripting/backend/codegen.cpp +++ b/src/scripting/backend/codegen.cpp @@ -48,6 +48,7 @@ #include "w_wad.h" #include "doomstat.h" #include "g_levellocals.h" +#include "v_video.h" extern FRandom pr_exrandom; FMemArena FxAlloc(65536); diff --git a/src/scripting/decorate/thingdef_parse.cpp b/src/scripting/decorate/thingdef_parse.cpp index 24360b165..68ab70cac 100644 --- a/src/scripting/decorate/thingdef_parse.cpp +++ b/src/scripting/decorate/thingdef_parse.cpp @@ -47,6 +47,7 @@ #include "w_wad.h" #include "v_text.h" #include "m_argv.h" +#include "v_video.h" void ParseOldDecoration(FScanner &sc, EDefinitionType def, PNamespace *ns); EXTERN_CVAR(Bool, strictdecorate); diff --git a/src/scripting/thingdef_properties.cpp b/src/scripting/thingdef_properties.cpp index 5cf0ebb0b..8f9916818 100644 --- a/src/scripting/thingdef_properties.cpp +++ b/src/scripting/thingdef_properties.cpp @@ -55,6 +55,7 @@ #include "g_levellocals.h" #include "types.h" #include "a_dynlight.h" +#include "v_video.h" //========================================================================== // diff --git a/src/scripting/vmthunks.cpp b/src/scripting/vmthunks.cpp index e6cf8b3c8..e78707413 100644 --- a/src/scripting/vmthunks.cpp +++ b/src/scripting/vmthunks.cpp @@ -48,6 +48,7 @@ #include "p_setup.h" #include "i_music.h" #include "am_map.h" +#include "v_video.h" DVector2 AM_GetPosition(); int Net_GetLatency(int *ld, int *ad); diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp index 53362669c..13959c7bb 100644 --- a/src/scripting/zscript/zcc_compile.cpp +++ b/src/scripting/zscript/zcc_compile.cpp @@ -41,6 +41,7 @@ #include "zcc_compile.h" #include "v_text.h" #include "p_lnspec.h" +#include "v_video.h" FSharedStringArena VMStringConstants; bool isActor(PContainerType *type);