diff options
| author | shfil <filip.gawin@zoho.com> | 2020-04-20 19:50:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 19:50:12 +0200 |
| commit | 7794cca429163429e9a4b216d717002ae1034040 (patch) | |
| tree | 10f23f0a163b2a7b3011b5570eb9af93010a25a1 /src/render/WaterLevel.cpp | |
| parent | updated librw again (diff) | |
| parent | Try to build with mingw (diff) | |
| download | re3-7794cca429163429e9a4b216d717002ae1034040.tar re3-7794cca429163429e9a4b216d717002ae1034040.tar.gz re3-7794cca429163429e9a4b216d717002ae1034040.tar.bz2 re3-7794cca429163429e9a4b216d717002ae1034040.tar.lz re3-7794cca429163429e9a4b216d717002ae1034040.tar.xz re3-7794cca429163429e9a4b216d717002ae1034040.tar.zst re3-7794cca429163429e9a4b216d717002ae1034040.zip | |
Diffstat (limited to 'src/render/WaterLevel.cpp')
| -rw-r--r-- | src/render/WaterLevel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp index ad0b3ec4..d7035ab1 100644 --- a/src/render/WaterLevel.cpp +++ b/src/render/WaterLevel.cpp @@ -979,7 +979,7 @@ CWaterLevel::RenderOneWavySector(float fX, float fY, float fZ, RwRGBA const &col SMALL_SECTOR_SIZE / 2, apBoatList) ) { - float fWakeColor = fAdd1 - max(255.0f - float(color.blue + color.red + color.green) / 3, fAdd2); + float fWakeColor = fAdd1 - Max(255.0f - float(color.blue + color.red + color.green) / 3, fAdd2); RpGeometry *wavyGeometry = RpAtomicGetGeometry(ms_pWavyAtomic); RpGeometry *geom = apGeomArray[nGeomUsed++]; @@ -1035,9 +1035,9 @@ CWaterLevel::RenderOneWavySector(float fX, float fY, float fZ, RwRGBA const &col RwRGBAAssign(&wakeColor, &color); - wakeColor.red = min(color.red + int32(fWakeColor * fRedMult * fDistMult), 255); - wakeColor.green = min(color.green + int32(fWakeColor * fGreenMult * fDistMult), 255); - wakeColor.blue = min(color.blue + int32(fWakeColor * fBlueMult * fDistMult), 255); + wakeColor.red = Min(color.red + int32(fWakeColor * fRedMult * fDistMult), 255); + wakeColor.green = Min(color.green + int32(fWakeColor * fGreenMult * fDistMult), 255); + wakeColor.blue = Min(color.blue + int32(fWakeColor * fBlueMult * fDistMult), 255); RwRGBAAssign(&geomPreLights[9*i+j], &wakeColor); @@ -1114,7 +1114,7 @@ CWaterLevel::CalcDistanceToWater(float fX, float fY) fSectorY + SMALL_SECTOR_SIZE - fY ); - fDistSqr = min(vecDist.MagnitudeSqr(), fDistSqr); + fDistSqr = Min(vecDist.MagnitudeSqr(), fDistSqr); } } } |