zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into new_level_refactor

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-30 22:03:21 +01:00
commit 0eb3b2abca
4 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/g_shared/a_dynlight.cpp
View file

@ -78,8 +78,6 @@ CUSTOM_CVAR (Bool, gl_lights, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOIN
} }
} }
CVAR (Bool, gl_attachedlights, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
//========================================================================== //==========================================================================
// //
//========================================================================== //==========================================================================
@ -863,6 +861,7 @@ void FLevelLocals::RecreateAllAttachedLights()
if (a->IsKindOf(NAME_DynamicLight)) if (a->IsKindOf(NAME_DynamicLight))
{ {
::AttachLight(a); ::AttachLight(a);
::ActivateLight(a);
} }
else else
{ {

1
src/g_shared/a_dynlight.h
View file

@ -6,7 +6,6 @@
EXTERN_CVAR(Bool, r_dynlights) EXTERN_CVAR(Bool, r_dynlights)
EXTERN_CVAR(Bool, gl_lights) EXTERN_CVAR(Bool, gl_lights)
EXTERN_CVAR(Bool, gl_attachedlights)
struct side_t; struct side_t;
struct seg_t; struct seg_t;

1
src/hwrenderer/utility/hw_cvars.h
View file

@ -16,7 +16,6 @@ EXTERN_CVAR(Bool, gl_usefb)
EXTERN_CVAR(Int, gl_weaponlight) EXTERN_CVAR(Int, gl_weaponlight)
EXTERN_CVAR (Bool, gl_lights); EXTERN_CVAR (Bool, gl_lights);
EXTERN_CVAR (Bool, gl_attachedlights);
EXTERN_CVAR (Bool, gl_light_sprites); EXTERN_CVAR (Bool, gl_light_sprites);
EXTERN_CVAR (Bool, gl_light_particles); EXTERN_CVAR (Bool, gl_light_particles);

1
wadsrc/static/menudef.txt
View file

@ -2260,7 +2260,6 @@ OptionMenu "GLLightOptions" protected
Title "$GLLIGHTMNU_TITLE" Title "$GLLIGHTMNU_TITLE"
Option "$TCMNU_DYNLIGHTS", "r_dynlights", "OnOff" Option "$TCMNU_DYNLIGHTS", "r_dynlights", "OnOff"
Option "$GLLIGHTMNU_LIGHTSENABLED", gl_lights, "OnOff" Option "$GLLIGHTMNU_LIGHTSENABLED", gl_lights, "OnOff"
Option "$GLLIGHTMNU_LIGHTDEFS", gl_attachedlights, "YesNo"
Option "$GLLIGHTMNU_LIGHTSPRITES", gl_light_sprites, "YesNo" Option "$GLLIGHTMNU_LIGHTSPRITES", gl_light_sprites, "YesNo"
Option "$GLLIGHTMNU_LIGHTPARTICLES", gl_light_particles, "YesNo" Option "$GLLIGHTMNU_LIGHTPARTICLES", gl_light_particles, "YesNo"
Option "$GLLIGHTMNU_LIGHTSHADOWMAP", gl_light_shadowmap, "YesNo" Option "$GLLIGHTMNU_LIGHTSHADOWMAP", gl_light_shadowmap, "YesNo"