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

Change define to if statement

Browse source
This commit is contained in:
Magnus Norddahl 2016-12-25 06:00:18 +01:00
parent ced7bdf94a
commit ea92b95483
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/r_walldraw.cpp
View file

@ -805,29 +805,31 @@ static void ProcessWallWorker(
double xmagnitude = 1.0; double xmagnitude = 1.0;
#if !defined(NO_DYNAMIC_SWLIGHTS) if (r_dynlights)
for (int x = x1; x < x2; x++, light += rw_lightstep)
{ {
int y1 = uwal[x]; for (int x = x1; x < x2; x++, light += rw_lightstep)
int y2 = dwal[x]; {
if (y2 <= y1) int y1 = uwal[x];
continue; int y2 = dwal[x];
if (y2 <= y1)
continue;
if (!fixed) if (!fixed)
R_SetColorMapLight(basecolormap, light, wallshade); R_SetColorMapLight(basecolormap, light, wallshade);
if (x + 1 < x2) xmagnitude = fabs(FIXED2DBL(lwal[x + 1]) - FIXED2DBL(lwal[x])); if (x + 1 < x2) xmagnitude = fabs(FIXED2DBL(lwal[x + 1]) - FIXED2DBL(lwal[x]));
WallSampler sampler(y1, swal[x], yrepeat, lwal[x] + xoffset, xmagnitude, rw_pic, getcol); WallSampler sampler(y1, swal[x], yrepeat, lwal[x] + xoffset, xmagnitude, rw_pic, getcol);
Draw1Column(x, y1, y2, sampler, draw1column); Draw1Column(x, y1, y2, sampler, draw1column);
}
NetUpdate();
return;
} }
#else
// Calculate where 4 column alignment begins and ends: // Calculate where 4 column alignment begins and ends:
int aligned_x1 = clamp((x1 + 3) / 4 * 4, x1, x2); int aligned_x1 = clamp((x1 + 3) / 4 * 4, x1, x2);
int aligned_x2 = clamp(x2 / 4 * 4, x1, x2); int aligned_x2 = clamp(x2 / 4 * 4, x1, x2);
double xmagnitude = 1.0;
// First unaligned columns: // First unaligned columns:
for (int x = x1; x < aligned_x1; x++, light += rw_lightstep) for (int x = x1; x < aligned_x1; x++, light += rw_lightstep)
{ {
@ -956,7 +958,6 @@ static void ProcessWallWorker(
WallSampler sampler(y1, swal[x], yrepeat, lwal[x] + xoffset, xmagnitude, rw_pic, getcol); WallSampler sampler(y1, swal[x], yrepeat, lwal[x] + xoffset, xmagnitude, rw_pic, getcol);
Draw1Column(x, y1, y2, sampler, draw1column); Draw1Column(x, y1, y2, sampler, draw1column);
} }
#endif
NetUpdate(); NetUpdate();
} }