Return-To-The-Roots
diff --git a/‎libs/s25main/gameData/GameConsts.h‎
Lines changed: 7 additions & 4 deletions b/‎libs/s25main/gameData/GameConsts.h‎
Lines changed: 7 additions & 4 deletions
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2025 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -12,8 +12,8 @@
 
 using namespace std::chrono_literals;
 /// Length of GameFrames for each speed level
-constexpr helpers::EnumArray<std::chrono::duration<unsigned, std::milli>, GameSpeed> SUPPRESS_UNUSED
- SPEED_GF_LENGTHS = {{80ms, 60ms, 50ms, 40ms, 30ms}};
+constexpr helpers::EnumArray<std::chrono::milliseconds, GameSpeed> SUPPRESS_UNUSED SPEED_GF_LENGTHS = {
+  {80ms, 60ms, 50ms, 40ms, 30ms}};
 constexpr auto MAX_SPEED = 10ms;
 constexpr auto MIN_SPEED = SPEED_GF_LENGTHS[GameSpeed::VerySlow];
 /// Max/Max speed for debug mode (includes replays)
@@ -24,12 +24,15 @@ constexpr auto SPEED_STEP = 10ms;
 
 /// Normal speed as reference speed for ingame time computations
 constexpr auto REFERENCE_SPEED = SPEED_GF_LENGTHS[GameSpeed::Normal];
+// When using unsigned as the type for number of GFs check that we can represent
+// game durations of at least a year in units of our chosen (reference) speed.
+static_assert(REFERENCE_SPEED * std::numeric_limits<unsigned>::max() >= 24h * 365);
 
 /// Get normalized number of game frames for the given duration
 template<class Rep, class Period>
 constexpr auto duration_to_gfs(const std::chrono::duration<Rep, Period> d)
 {
- return d / REFERENCE_SPEED;
+ return static_cast<unsigned>(d / REFERENCE_SPEED);
 }
 
 /// Get normalized duration for the given number of game frames