Fix ambiguous clamp and switch to `std::chrono::milliseconds` by Flamefire · Pull Request #1973 · Return-To-The-Roots/s25client

Flamefire · 2026-08-26T10:09:15Z

C++17 introduced std::clamp which makes passing a type from std namespace (such as chrono-types) ambiguous in the semi-recursive call. Use constexpr-ifs and std::clamp in the final path.

Flow86 · 2026-08-26T19:12:41Z

pipeline fails?

Flamefire · 2026-08-27T08:53:06Z

Hm, seems like this didn't work standalone due to mixing duration types. Switching to use the chrono types consistently now. There was one place where we used our own 32 bit ms type but that's pretty much irrelevant now in 64bit days.
Using the standard types allows using the chrono literals too

For some reason it sometimes adds a space before `&`

C++17 introduced `std::clamp` which makes passing a type from std namespace (such as chrono-types) ambiguous in the semi-recursive call. Use constexpr-ifs and `std::clamp` in the final path.

Flamefire requested a review from Flow86 August 26, 2026 10:09

Flamefire force-pushed the clamp-fix branch from 803cba5 to d868047 Compare August 27, 2026 08:51

Flamefire force-pushed the clamp-fix branch from d868047 to eb6f3e0 Compare August 27, 2026 10:40

Flamefire added 4 commits August 27, 2026 15:23

Disable clang-format for a line it keeps changing

6277878

For some reason it sometimes adds a space before `&`

Fix ambiguous clamp

557b444

C++17 introduced `std::clamp` which makes passing a type from std namespace (such as chrono-types) ambiguous in the semi-recursive call. Use constexpr-ifs and `std::clamp` in the final path.

Use std::chrono::milliseconds for game speed

fcab253

Use std::chrono::milliseconds consistently.

c771302

Flamefire force-pushed the clamp-fix branch from eb6f3e0 to c771302 Compare August 27, 2026 13:23

Flamefire changed the title ~~Fix ambiguous clamp~~ Fix ambiguous clamp and switch to std::chrono::milliseconds Aug 27, 2026