zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-01 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove wallshade global from R_RenderDecals

Browse source
This commit is contained in:
Magnus Norddahl 2016-12-31 12:59:43 +01:00
parent 918904074a
commit ce864655e3
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/swrenderer/scene/r_segs.cpp
View file

@ -1811,7 +1811,7 @@ bool R_StoreWallRange (int start, int stop)
// [ZZ] Only if not an active mirror // [ZZ] Only if not an active mirror
if (!rw_markportal) if (!rw_markportal)
{ {
R_RenderDecals(curline->sidedef, draw_segment); R_RenderDecals(curline->sidedef, draw_segment, wallshade);
} }
if (rw_markportal) if (rw_markportal)

6
src/swrenderer/things/r_decal.cpp
View file

@ -33,11 +33,11 @@
namespace swrenderer namespace swrenderer
{ {
void R_RenderDecals(side_t *sidedef, drawseg_t *draw_segment) void R_RenderDecals(side_t *sidedef, drawseg_t *draw_segment, int wallshade)
{ {
for (DBaseDecal *decal = sidedef->AttachedDecals; decal != NULL; decal = decal->WallNext) for (DBaseDecal *decal = sidedef->AttachedDecals; decal != NULL; decal = decal->WallNext)
{ {
R_RenderDecal(sidedef, decal, draw_segment, 0); R_RenderDecal(sidedef, decal, draw_segment, wallshade, 0);
} }
} }
@ -45,7 +45,7 @@ namespace swrenderer
// = 1: drawing masked textures (including sprites) // = 1: drawing masked textures (including sprites)
// Currently, only pass = 0 is done or used // Currently, only pass = 0 is done or used
void R_RenderDecal(side_t *wall, DBaseDecal *decal, drawseg_t *clipper, int pass) void R_RenderDecal(side_t *wall, DBaseDecal *decal, drawseg_t *clipper, int wallshade, int pass)
{ {
DVector2 decal_left, decal_right, decal_pos; DVector2 decal_left, decal_right, decal_pos;
int x1, x2; int x1, x2;

4
src/swrenderer/things/r_decal.h
View file

@ -8,6 +8,6 @@ namespace swrenderer
{ {
struct drawseg_t; struct drawseg_t;
void R_RenderDecals(side_t *wall, drawseg_t *draw_segment); void R_RenderDecals(side_t *wall, drawseg_t *draw_segment, int wallshade);
void R_RenderDecal(side_t *wall, DBaseDecal *first, drawseg_t *clipper, int pass); void R_RenderDecal(side_t *wall, DBaseDecal *first, drawseg_t *clipper, int wallshade, int pass);
} }