diff options
author | Filip Gawin <filip.gawin@zoho.com> | 2019-07-31 17:54:18 +0200 |
---|---|---|
committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:13:17 +0200 |
commit | af5bd951aeb43c341d5126bc4141992169e46d57 (patch) | |
tree | 08c819a7c31d30abb6915b21b80239ace256b692 /src/render/WaterLevel.cpp | |
parent | Merge pull request #197 from Nick007J/master (diff) | |
download | re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.gz re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.bz2 re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.lz re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.xz re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.zst re3-af5bd951aeb43c341d5126bc4141992169e46d57.zip |
Diffstat (limited to 'src/render/WaterLevel.cpp')
-rw-r--r-- | src/render/WaterLevel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp index 48e8f83b..c711c8c8 100644 --- a/src/render/WaterLevel.cpp +++ b/src/render/WaterLevel.cpp @@ -9,7 +9,7 @@ #include "Boat.h" #include "World.h" #include "General.h" -#include "TimeCycle.h" +#include "Timecycle.h" #include "ZoneCull.h" #include "Clock.h" #include "Particle.h" @@ -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); } } } |