diff options
| author | withmorten <morten.with@gmail.com> | 2021-06-28 13:31:35 +0200 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-06-28 13:31:35 +0200 |
| commit | cb3b3855b844c14c0e943c1a7614fc29820cf666 (patch) | |
| tree | 8e9a6ae74e9c98515b813f412476058274d3fde4 /src/render/Sprite.cpp | |
| parent | cc235be3aa1ad97ac7067af0d619ee714d9d05eb (diff) | |
rename clamp macro to Clamp to fix compilation with g++11
Diffstat (limited to 'src/render/Sprite.cpp')
| -rw-r--r-- | src/render/Sprite.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/Sprite.cpp b/src/render/Sprite.cpp index a441e08b..3fef0733 100644 --- a/src/render/Sprite.cpp +++ b/src/render/Sprite.cpp @@ -405,13 +405,13 @@ CSprite::RenderBufferedOneXLUSprite_Rotate_2Colours(float x, float y, float z, f // Colour factors, cx/y is the direction in which colours change from rgb1 to rgb2 cf[0] = (cx*(-c-s) + cy*(-c+s))*0.5f + 0.5f; - cf[0] = clamp(cf[0], 0.0f, 1.0f); + cf[0] = Clamp(cf[0], 0.0f, 1.0f); cf[1] = (cx*(-c+s) + cy*( c+s))*0.5f + 0.5f; - cf[1] = clamp(cf[1], 0.0f, 1.0f); + cf[1] = Clamp(cf[1], 0.0f, 1.0f); cf[2] = (cx*( c+s) + cy*( c-s))*0.5f + 0.5f; - cf[2] = clamp(cf[2], 0.0f, 1.0f); + cf[2] = Clamp(cf[2], 0.0f, 1.0f); cf[3] = (cx*( c-s) + cy*(-c-s))*0.5f + 0.5f; - cf[3] = clamp(cf[3], 0.0f, 1.0f); + cf[3] = Clamp(cf[3], 0.0f, 1.0f); float screenz = m_f2DNearScreenZ + (z-CDraw::GetNearClipZ())*(m_f2DFarScreenZ-m_f2DNearScreenZ)*CDraw::GetFarClipZ() / |