diff options
author | aap <aap@papnet.eu> | 2020-04-20 20:17:43 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-04-20 20:17:43 +0200 |
commit | 56035468567032429727724d2ecf17f57d299d61 (patch) | |
tree | 49c847c062cf1cd40b79213064bf8dd2c7ae499e /src/render/Weather.cpp | |
parent | librw (diff) | |
parent | Merge pull request #477 from ShFil119/mingw (diff) | |
download | re3-56035468567032429727724d2ecf17f57d299d61.tar re3-56035468567032429727724d2ecf17f57d299d61.tar.gz re3-56035468567032429727724d2ecf17f57d299d61.tar.bz2 re3-56035468567032429727724d2ecf17f57d299d61.tar.lz re3-56035468567032429727724d2ecf17f57d299d61.tar.xz re3-56035468567032429727724d2ecf17f57d299d61.tar.zst re3-56035468567032429727724d2ecf17f57d299d61.zip |
Diffstat (limited to 'src/render/Weather.cpp')
-rw-r--r-- | src/render/Weather.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/Weather.cpp b/src/render/Weather.cpp index 8bc544c6..b4031705 100644 --- a/src/render/Weather.cpp +++ b/src/render/Weather.cpp @@ -163,7 +163,7 @@ void CWeather::Update(void) else { // 0.125 probability LightningBurst = false; - LightningDuration = min(CTimer::GetFrameCounter() - LightningStart, 20); + LightningDuration = Min(CTimer::GetFrameCounter() - LightningStart, 20); LightningFlash = false; WhenToPlayLightningSound = CTimer::GetTimeInMilliseconds() + 150 * (20 - LightningDuration); } @@ -219,9 +219,9 @@ void CWeather::Update(void) fNewRain = 0.0f; if (Rain != fNewRain) { // ok to use comparasion if (Rain < fNewRain) - Rain = min(fNewRain, Rain + RAIN_CHANGE_SPEED * CTimer::GetTimeStep()); + Rain = Min(fNewRain, Rain + RAIN_CHANGE_SPEED * CTimer::GetTimeStep()); else - Rain = max(fNewRain, Rain - RAIN_CHANGE_SPEED * CTimer::GetTimeStep()); + Rain = Max(fNewRain, Rain - RAIN_CHANGE_SPEED * CTimer::GetTimeStep()); } // Clouds |