zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2024-11-14 00:10:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

- GZDoom-side of the fix from ZDoom r4193, included in r1543: putting a lightlist in a sector caused that sector's floorlight and ceilinglight to be ignored.

Browse source 
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1545 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2013-03-24 09:58:19 +00:00
parent 504e928d2f
commit a0cd462a4a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gl/scene/gl_flats.cpp
View file

@ -630,8 +630,11 @@ void GLFlat::ProcessSector(sector_t * frontsector)
if (x.ffloors.Size())
{
light = P_GetPlaneLight(sector, &frontsector->floorplane, false);
if (!(sector->GetFlags(sector_t::floor)&PLANEF_ABSLIGHTING) || light!=&x.lightlist[0])
if ((!(sector->GetFlags(sector_t::floor)&PLANEF_ABSLIGHTING) || light!=&x.lightlist[0])
&& (light->p_lightlevel != &frontsector->lightlevel))
{
lightlevel = *light->p_lightlevel;
}
Colormap.CopyLightColor(light->extra_colormap);
}
@ -680,7 +683,11 @@ void GLFlat::ProcessSector(sector_t * frontsector)
{
light = P_GetPlaneLight(sector, &sector->ceilingplane, true);
if(!(sector->GetFlags(sector_t::ceiling)&PLANEF_ABSLIGHTING)) lightlevel = *light->p_lightlevel;
if ((!(sector->GetFlags(sector_t::ceiling)&PLANEF_ABSLIGHTING))
&& (light->p_lightlevel != &frontsector->lightlevel))
{
lightlevel = *light->p_lightlevel;
}
Colormap.CopyLightColor(light->extra_colormap);
}
renderstyle = STYLE_Translucent;

2
wadsrc/CMakeLists.txt
View file

@ -4,7 +4,7 @@ get_target_property(ZIPDIR_EXE zipdir LOCATION)
add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/gzdoom.pk3
COMMAND ${ZIPDIR_EXE} -udf ${ZDOOM_OUTPUT_DIR}/gzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 $<TARGET_FILE_DIR:zdoom>
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZDOOM_OUTPUT_DIR}/gzdoom.pk3 $<TARGET_FILE_DIR:zdoom>
DEPENDS zipdir ${CMAKE_CURRENT_SOURCE_DIR}/static )
add_custom_target( pk3 ALL