Even more conversion, lots of superfluous macro removal
This commit is contained in:
+5
-7
@@ -146,13 +146,11 @@ R_InitParticles
|
||||
*/
|
||||
void R_InitParticles (void)
|
||||
{
|
||||
int i;
|
||||
auto i = common::check_param ("-particles");
|
||||
|
||||
i = COM_CheckParm ("-particles");
|
||||
|
||||
if (i && i < com_argc - 1)
|
||||
if (i.has_value() && i.value() < com_argc - 1)
|
||||
{
|
||||
r_numparticles = atoi(com_argv[i + 1]);
|
||||
r_numparticles = atoi(com_argv[i.value() + 1]);
|
||||
if (r_numparticles < ABSOLUTE_MIN_PARTICLES)
|
||||
r_numparticles = ABSOLUTE_MIN_PARTICLES;
|
||||
else if (r_numparticles > ABSOLUTE_MAX_PARTICLES)
|
||||
@@ -870,7 +868,7 @@ void R_DrawParticles (void)
|
||||
color[0] = c[0];
|
||||
color[1] = c[1];
|
||||
color[2] = c[2];
|
||||
//alpha = CLAMP(0, p->die + 0.5 - cl.time, 1);
|
||||
//alpha = std::clamp(p->die + 0.5 - cl.time, 0, 1);
|
||||
color[3] = 255; //(int)(alpha * 255);
|
||||
glColor4ubv(color);
|
||||
//johnfitz
|
||||
@@ -913,7 +911,7 @@ void R_DrawParticles (void)
|
||||
color[0] = c[0];
|
||||
color[1] = c[1];
|
||||
color[2] = c[2];
|
||||
//alpha = CLAMP(0, p->die + 0.5 - cl.time, 1);
|
||||
//alpha = std::clamp(p->die + 0.5 - cl.time, 0, 1);
|
||||
color[3] = 255; //(int)(alpha * 255);
|
||||
glColor4ubv(color);
|
||||
//johnfitz
|
||||
|
||||
Reference in New Issue
Block a user