diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2020-04-19 18:34:08 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2020-04-20 18:18:46 +0200 |
| commit | 370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96 (patch) | |
| tree | 5f5c66a542d7a121a7db88fed66e31f2a263b206 /src/render/Weather.cpp | |
| parent | Merge pull request #474 from Nick007J/master (diff) | |
| download | re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.gz re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.bz2 re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.lz re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.xz re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.zst re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.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 |