zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 09:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use std::min and std::max instead of min and max macros.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7078 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-16 06:09:54 +00:00
parent e77325f2a4
commit 9613bbac33
21 changed files with 105 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/build/src/voxmodel.cpp
View file

@ -972,8 +972,7 @@ int32_t polymost_voxdraw(voxmodel_t *m, const uspritetype *tspr)
float pc[4];
pc[0] = pc[1] = pc[2] =
(float)(numshades-min(max((globalshade * shadescale)+m->shadeoff, 0), numshades)) / (float)numshades;
pc[0] = pc[1] = pc[2] = ((float)numshades - min(max((globalshade * shadescale) + m->shadeoff, 0.f), (float)numshades)) / (float)numshades;
hictinting_apply(pc, globalpal);
pc[3] = (tspr->cstat&2) ? glblend[tspr->blend].def[!!(tspr->cstat&512)].alpha : 1.0f;