zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-04 19:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: When checking for fog in a sector with Transfer_Heights the wrong sector data was used.

Browse source 
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1162 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2011-01-12 08:35:42 +00:00
parent 05763b39eb
commit 04fa59d54e
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -440,7 +440,7 @@ void GLFlat::Draw(int pass)
// plane in the appropriate render list. // plane in the appropriate render list.
// //
//========================================================================== //==========================================================================
inline void GLFlat::PutFlat(bool fog) inline void GLFlat::PutFlat(sector_t *model, bool fog)
{ {
int list; int list;
@ -465,7 +465,7 @@ inline void GLFlat::PutFlat(bool fog)
if (!gl_fixedcolormap) if (!gl_fixedcolormap)
{ {
foggy = gl_CheckFog(sector, NULL) || level.flags&LEVEL_HASFADETABLE; foggy = gl_CheckFog(model, NULL) || level.flags&LEVEL_HASFADETABLE;
if (gl_lights && !gl_dynlight_shader && GLRenderer->mLightCount) // Are lights touching this sector? if (gl_lights && !gl_dynlight_shader && GLRenderer->mLightCount) // Are lights touching this sector?
{ {
@ -521,7 +521,7 @@ void GLFlat::Process(sector_t * model, int whichplane, bool fog)
z = plane.plane.ZatPoint(0.f, 0.f); z = plane.plane.ZatPoint(0.f, 0.f);
PutFlat(fog); PutFlat(model, fog);
rendered_flats++; rendered_flats++;
} }

2
src/gl/scene/gl_wall.h
View file

@ -276,7 +276,7 @@ public:
void DrawSubsectorLights(subsector_t * sub, int pass); void DrawSubsectorLights(subsector_t * sub, int pass);
void DrawSubsectors(int pass, bool istrans); void DrawSubsectors(int pass, bool istrans);
void PutFlat(bool fog = false); void PutFlat(sector_t *fakesector, bool fog = false);
void Process(sector_t * model, int whichplane, bool notexture); void Process(sector_t * model, int whichplane, bool notexture);
void SetFrom3DFloor(F3DFloor *rover, bool top, bool underside); void SetFrom3DFloor(F3DFloor *rover, bool top, bool underside);
void ProcessSector(sector_t * frontsector); void ProcessSector(sector_t * frontsector);