summaryrefslogtreecommitdiffstats
path: root/src/render/Weather.cpp
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2021-01-03 00:12:01 +0100
committershfil <filip.gawin@zoho.com>2021-01-04 00:16:32 +0100
commitbbbfe658704c5245df6daa1b7418003dc9169916 (patch)
tree0f4231438b24683eb761061103e9d4cb37127e59 /src/render/Weather.cpp
parentfixed intro text line defaults (diff)
downloadre3-bbbfe658704c5245df6daa1b7418003dc9169916.tar
re3-bbbfe658704c5245df6daa1b7418003dc9169916.tar.gz
re3-bbbfe658704c5245df6daa1b7418003dc9169916.tar.bz2
re3-bbbfe658704c5245df6daa1b7418003dc9169916.tar.lz
re3-bbbfe658704c5245df6daa1b7418003dc9169916.tar.xz
re3-bbbfe658704c5245df6daa1b7418003dc9169916.tar.zst
re3-bbbfe658704c5245df6daa1b7418003dc9169916.zip
Diffstat (limited to '')
-rw-r--r--src/render/Weather.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/render/Weather.cpp b/src/render/Weather.cpp
index bf3e51b4..771f85de 100644
--- a/src/render/Weather.cpp
+++ b/src/render/Weather.cpp
@@ -202,6 +202,7 @@ void CWeather::Update(void)
}
// Rain
+#ifndef VC_RAIN_NERF
float fNewRain;
if (NewWeatherType == WEATHER_RAINY) {
// if raining for >1 hour, values: 0, 0.33, 0.66, 0.99, switching every ~16.5s
@@ -223,6 +224,25 @@ void CWeather::Update(void)
else
Rain = Max(fNewRain, Rain - RAIN_CHANGE_SPEED * CTimer::GetTimeStep());
}
+#else
+ float fNewRain;
+ if (NewWeatherType == WEATHER_RAINY) {
+ // if raining for >1 hour, values: 0, 0.33, switching every ~16.5s
+ fNewRain = (((uint16)CTimer::GetTimeInMilliseconds() >> 14) & 1) * 0.33f;
+ if (OldWeatherType != WEATHER_RAINY) {
+ if (InterpolationValue < 0.4f)
+ // if rain has just started (<24 minutes), always 0.5
+ fNewRain = 0.5f;
+ else
+ // if rain is ongoing for >24 minutes, values: 0.25, 0.5, switching every ~16.5s
+ fNewRain = 0.25f + (((uint16)CTimer::GetTimeInMilliseconds() >> 14) & 1) * 0.25f;
+ }
+ fNewRain = Max(fNewRain, 0.5f);
+ }
+ else
+ fNewRain = 0.0f;
+ Rain = fNewRain;
+#endif
// Clouds
if (OldWeatherType != WEATHER_SUNNY)