mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-24 21:21:04 +00:00
- removed v_video.h include from portals.h
This has no business in a play related file which also made no use of it.
This commit is contained in:
parent
18fb7fdd81
commit
e3eaa5964d
23 changed files with 22 additions and 2 deletions
|
@ -55,6 +55,7 @@ struct visstyle_t;
|
||||||
class FLightDefaults;
|
class FLightDefaults;
|
||||||
struct FSection;
|
struct FSection;
|
||||||
struct FLevelLocals;
|
struct FLevelLocals;
|
||||||
|
struct FDynamicLight;
|
||||||
//
|
//
|
||||||
// NOTES: AActor
|
// NOTES: AActor
|
||||||
//
|
//
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
#include "d_player.h"
|
#include "d_player.h"
|
||||||
#include "p_blockmap.h"
|
#include "p_blockmap.h"
|
||||||
#include "g_game.h"
|
#include "g_game.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
#include "m_cheat.h"
|
#include "m_cheat.h"
|
||||||
#include "c_dispatch.h"
|
#include "c_dispatch.h"
|
||||||
|
|
|
@ -67,6 +67,7 @@
|
||||||
#include "r_utility.h"
|
#include "r_utility.h"
|
||||||
#include "c_functions.h"
|
#include "c_functions.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
extern FILE *Logfile;
|
extern FILE *Logfile;
|
||||||
extern bool insave;
|
extern bool insave;
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
|
|
||||||
#include "g_game.h"
|
#include "g_game.h"
|
||||||
#include "d_player.h"
|
#include "d_player.h"
|
||||||
|
#include "v_video.h"
|
||||||
#include "d_netinf.h"
|
#include "d_netinf.h"
|
||||||
|
|
||||||
#include "menu/menu.h"
|
#include "menu/menu.h"
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#include "d_net.h"
|
#include "d_net.h"
|
||||||
#include "d_event.h"
|
#include "d_event.h"
|
||||||
#include "sbar.h"
|
#include "sbar.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
#define QUEUESIZE 128
|
#define QUEUESIZE 128
|
||||||
#define MESSAGESIZE 128
|
#define MESSAGESIZE 128
|
||||||
|
|
|
@ -51,6 +51,7 @@
|
||||||
#include "menu/menu.h"
|
#include "menu/menu.h"
|
||||||
#include "vm.h"
|
#include "vm.h"
|
||||||
#include "events.h"
|
#include "events.h"
|
||||||
|
#include "v_video.h"
|
||||||
#include "scripting/types.h"
|
#include "scripting/types.h"
|
||||||
|
|
||||||
int DMenu::InMenu;
|
int DMenu::InMenu;
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
#include "m_argv.h"
|
#include "m_argv.h"
|
||||||
#include "i_soundfont.h"
|
#include "i_soundfont.h"
|
||||||
#include "i_system.h"
|
#include "i_system.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
|
|
||||||
void ClearSaveGames();
|
void ClearSaveGames();
|
||||||
|
|
|
@ -55,6 +55,7 @@
|
||||||
#include "menu/menu.h"
|
#include "menu/menu.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
#include "vm.h"
|
#include "vm.h"
|
||||||
|
#include "v_video.h"
|
||||||
#include "actorinlines.h"
|
#include "actorinlines.h"
|
||||||
|
|
||||||
// The conversations as they exist inside a SCRIPTxx lump.
|
// The conversations as they exist inside a SCRIPTxx lump.
|
||||||
|
|
|
@ -73,6 +73,7 @@
|
||||||
#include "p_acs.h"
|
#include "p_acs.h"
|
||||||
#include "am_map.h"
|
#include "am_map.h"
|
||||||
#include "i_system.h"
|
#include "i_system.h"
|
||||||
|
#include "v_video.h"
|
||||||
#include "fragglescript/t_script.h"
|
#include "fragglescript/t_script.h"
|
||||||
|
|
||||||
extern AActor *SpawnMapThing (int index, FMapThing *mthing, int position);
|
extern AActor *SpawnMapThing (int index, FMapThing *mthing, int position);
|
||||||
|
|
|
@ -90,6 +90,7 @@
|
||||||
#include "p_acs.h"
|
#include "p_acs.h"
|
||||||
#include "events.h"
|
#include "events.h"
|
||||||
#include "g_game.h"
|
#include "g_game.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
static FRandom pr_skullpop ("SkullPop");
|
static FRandom pr_skullpop ("SkullPop");
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#define _PORTALS_H_
|
#define _PORTALS_H_
|
||||||
|
|
||||||
#include "basictypes.h"
|
#include "basictypes.h"
|
||||||
#include "v_video.h"
|
|
||||||
#include "m_bbox.h"
|
#include "m_bbox.h"
|
||||||
|
|
||||||
struct FPortalGroupArray;
|
struct FPortalGroupArray;
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
#include "v_text.h"
|
#include "v_text.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
#include "a_dynlight.h"
|
#include "a_dynlight.h"
|
||||||
|
#include "v_video.h"
|
||||||
#include "textures/skyboxtexture.h"
|
#include "textures/skyboxtexture.h"
|
||||||
#include "hwrenderer/postprocessing/hw_postprocessshader.h"
|
#include "hwrenderer/postprocessing/hw_postprocessshader.h"
|
||||||
#include "hwrenderer/textures/hw_material.h"
|
#include "hwrenderer/textures/hw_material.h"
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include "gl_load/gl_system.h"
|
#include "gl_load/gl_system.h"
|
||||||
#include "gl_buffers.h"
|
#include "gl_buffers.h"
|
||||||
#include "gl/renderer/gl_renderstate.h"
|
#include "gl/renderer/gl_renderstate.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
namespace OpenGLRenderer
|
namespace OpenGLRenderer
|
||||||
{
|
{
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include "c_cvars.h"
|
#include "c_cvars.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
#include "flatvertices.h"
|
#include "flatvertices.h"
|
||||||
|
#include "v_video.h"
|
||||||
#include "cmdlib.h"
|
#include "cmdlib.h"
|
||||||
#include "hwrenderer/data/buffers.h"
|
#include "hwrenderer/data/buffers.h"
|
||||||
#include "hwrenderer/scene/hw_renderstate.h"
|
#include "hwrenderer/scene/hw_renderstate.h"
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "hwrenderer/data/buffers.h"
|
#include "hwrenderer/data/buffers.h"
|
||||||
#include "stats.h"
|
#include "stats.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
The 1D shadow maps are stored in a 1024x1024 texture as float depth values (R32F).
|
The 1D shadow maps are stored in a 1024x1024 texture as float depth values (R32F).
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "p_pspr.h"
|
#include "p_pspr.h"
|
||||||
#include "r_data/voxels.h"
|
#include "r_data/voxels.h"
|
||||||
#include "r_data/models/models.h"
|
#include "r_data/models/models.h"
|
||||||
|
#include "hwrenderer/data/buffers.h"
|
||||||
|
|
||||||
class GLSprite;
|
class GLSprite;
|
||||||
struct HWDrawInfo;
|
struct HWDrawInfo;
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
#include "v_palette.h"
|
#include "v_palette.h"
|
||||||
#include "r_data/matrix.h"
|
#include "r_data/matrix.h"
|
||||||
|
#include "hwrenderer/data/buffers.h"
|
||||||
|
|
||||||
class FMaterial;
|
class FMaterial;
|
||||||
class FRenderState;
|
class FRenderState;
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include "textures/skyboxtexture.h"
|
#include "textures/skyboxtexture.h"
|
||||||
#include "hwrenderer/textures/hw_material.h"
|
#include "hwrenderer/textures/hw_material.h"
|
||||||
#include "image.h"
|
#include "image.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
|
|
|
@ -48,6 +48,7 @@
|
||||||
#include "w_wad.h"
|
#include "w_wad.h"
|
||||||
#include "doomstat.h"
|
#include "doomstat.h"
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
extern FRandom pr_exrandom;
|
extern FRandom pr_exrandom;
|
||||||
FMemArena FxAlloc(65536);
|
FMemArena FxAlloc(65536);
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
#include "w_wad.h"
|
#include "w_wad.h"
|
||||||
#include "v_text.h"
|
#include "v_text.h"
|
||||||
#include "m_argv.h"
|
#include "m_argv.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
void ParseOldDecoration(FScanner &sc, EDefinitionType def, PNamespace *ns);
|
void ParseOldDecoration(FScanner &sc, EDefinitionType def, PNamespace *ns);
|
||||||
EXTERN_CVAR(Bool, strictdecorate);
|
EXTERN_CVAR(Bool, strictdecorate);
|
||||||
|
|
|
@ -55,6 +55,7 @@
|
||||||
#include "g_levellocals.h"
|
#include "g_levellocals.h"
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
#include "a_dynlight.h"
|
#include "a_dynlight.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
//
|
//
|
||||||
|
|
|
@ -48,6 +48,7 @@
|
||||||
#include "p_setup.h"
|
#include "p_setup.h"
|
||||||
#include "i_music.h"
|
#include "i_music.h"
|
||||||
#include "am_map.h"
|
#include "am_map.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
DVector2 AM_GetPosition();
|
DVector2 AM_GetPosition();
|
||||||
int Net_GetLatency(int *ld, int *ad);
|
int Net_GetLatency(int *ld, int *ad);
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
#include "zcc_compile.h"
|
#include "zcc_compile.h"
|
||||||
#include "v_text.h"
|
#include "v_text.h"
|
||||||
#include "p_lnspec.h"
|
#include "p_lnspec.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
FSharedStringArena VMStringConstants;
|
FSharedStringArena VMStringConstants;
|
||||||
bool isActor(PContainerType *type);
|
bool isActor(PContainerType *type);
|
||||||
|
|
Loading…
Reference in a new issue