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

Remove static from RenderFogBoundary

Browse source
This commit is contained in:
Magnus Norddahl 2017-01-26 08:24:44 +01:00
parent 29dcea49d7
commit 8b0304c1e3
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/swrenderer/line/r_fogboundary.cpp
View file

@ -145,6 +145,4 @@ namespace swrenderer
R_Drawers()->DrawFogBoundaryLine(y, x1, spanend[y]); R_Drawers()->DrawFogBoundaryLine(y, x1, spanend[y]);
} }
} }
short RenderFogBoundary::spanend[MAXHEIGHT];
} }

7
src/swrenderer/line/r_fogboundary.h
View file

@ -18,12 +18,11 @@ namespace swrenderer
class RenderFogBoundary class RenderFogBoundary
{ {
public: public:
static void Render(int x1, int x2, short *uclip, short *dclip, int wallshade, float lightleft, float lightstep, FDynamicColormap *basecolormap); void Render(int x1, int x2, short *uclip, short *dclip, int wallshade, float lightleft, float lightstep, FDynamicColormap *basecolormap);
private: private:
static void RenderSection(int y, int y2, int x1); void RenderSection(int y, int y2, int x1);
static short spanend[MAXHEIGHT]; short spanend[MAXHEIGHT];
}; };
} }

3
src/swrenderer/line/r_renderdrawsegment.cpp
View file

@ -48,6 +48,7 @@ namespace swrenderer
{ {
void RenderDrawSegment::Render(DrawSegment *ds, int x1, int x2) void RenderDrawSegment::Render(DrawSegment *ds, int x1, int x2)
{ {
RenderFogBoundary renderfog;
float *MaskedSWall = nullptr, MaskedScaleY = 0, rw_scalestep = 0; float *MaskedSWall = nullptr, MaskedScaleY = 0, rw_scalestep = 0;
fixed_t *maskedtexturecol = nullptr; fixed_t *maskedtexturecol = nullptr;
@ -121,7 +122,7 @@ namespace swrenderer
// [RH] Draw fog partition // [RH] Draw fog partition
if (ds->bFogBoundary) if (ds->bFogBoundary)
{ {
RenderFogBoundary::Render(x1, x2, mceilingclip, mfloorclip, wallshade, rw_light, rw_lightstep, basecolormap); renderfog.Render(x1, x2, mceilingclip, mfloorclip, wallshade, rw_light, rw_lightstep, basecolormap);
if (ds->maskedtexturecol == nullptr) if (ds->maskedtexturecol == nullptr)
{ {
goto clearfog; goto clearfog;