diff options
author | Filip Gawin <filip.gawin@zoho.com> | 2019-08-16 20:17:15 +0200 |
---|---|---|
committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:18:47 +0200 |
commit | 2fabbc3b4cab40220986f402569af64673cb4cd9 (patch) | |
tree | 3278631a5e3dd19a0af92204e6bfb48702dd04f0 /src/render/Clouds.cpp | |
parent | Cleanup (diff) | |
download | re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.gz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.bz2 re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.lz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.xz re3-2fabbc3b4cab40220986f402569af64673cb4cd9.tar.zst re3-2fabbc3b4cab40220986f402569af64673cb4cd9.zip |
Diffstat (limited to '')
-rw-r--r-- | src/render/Clouds.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/Clouds.cpp b/src/render/Clouds.cpp index 2884894c..a461301c 100644 --- a/src/render/Clouds.cpp +++ b/src/render/Clouds.cpp @@ -388,7 +388,7 @@ CClouds::RenderBackground(int16 topred, int16 topgreen, int16 topblue, ms_colourBottom.b = topblue; ms_colourBottom.a = alpha; - botpos = min(SCREEN_HEIGHT, topedge); + botpos = Min(SCREEN_HEIGHT, topedge); CSprite2d::DrawRect(CRect(0, 0, SCREEN_WIDTH, botpos), ms_colourBottom, ms_colourBottom, ms_colourTop, ms_colourTop); } @@ -415,18 +415,18 @@ CClouds::RenderHorizon(void) if(ms_horizonZ > SCREEN_HEIGHT) return; - float z1 = min(ms_horizonZ + SMALLSTRIPHEIGHT, SCREEN_HEIGHT); + float z1 = Min(ms_horizonZ + SMALLSTRIPHEIGHT, SCREEN_HEIGHT); CSprite2d::DrawRectXLU(CRect(0, ms_horizonZ, SCREEN_WIDTH, z1), ms_colourBottom, ms_colourBottom, ms_colourTop, ms_colourTop); // This is just weird float a = SCREEN_HEIGHT/400.0f * HORIZSTRIPHEIGHT + - SCREEN_HEIGHT/300.0f * max(TheCamera.GetPosition().z, 0.0f); + SCREEN_HEIGHT/300.0f * Max(TheCamera.GetPosition().z, 0.0f); float b = TheCamera.GetUp().z < 0.0f ? SCREEN_HEIGHT : SCREEN_HEIGHT * Abs(TheCamera.GetRight().z); float z2 = z1 + (a + b)*TheCamera.LODDistMultiplier; - z2 = min(z2, SCREEN_HEIGHT); + z2 = Min(z2, SCREEN_HEIGHT); CSprite2d::DrawRect(CRect(0, z1, SCREEN_WIDTH, z2), ms_colourBottom, ms_colourBottom, ms_colourTop, ms_colourTop); } |