summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/World.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 6c806ec6e..1b7bc8643 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -492,11 +492,7 @@ int cWorld::GetDefaultWeatherInterval(eWeather a_Weather)
return Random.RandInt(m_MinThunderStormTicks, m_MaxThunderStormTicks);
}
}
-
- #ifndef __clang__
- ASSERT(!"Unknown weather");
- return -1;
- #endif
+ UNREACHABLE("Unsupported weather");
}
@@ -851,19 +847,17 @@ eWeather cWorld::ChooseNewWeather()
switch (m_Weather)
{
case eWeather_Sunny:
- case eWeather_ThunderStorm: return eWeather_Rain;
-
+ case eWeather_ThunderStorm:
+ {
+ return eWeather_Rain;
+ }
case eWeather_Rain:
{
// 1 / 8 chance of turning into a thunderstorm
return GetRandomProvider().RandBool(0.125) ? eWeather_ThunderStorm : eWeather_Sunny;
}
}
-
- #ifndef __clang__
- ASSERT(!"Unknown weather");
- return eWeather_Sunny;
- #endif
+ UNREACHABLE("Unsupported weather");
}