diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h index eb693a81a0..316f35f3c0 100644 --- a/src/openrct2/Context.h +++ b/src/openrct2/Context.h @@ -187,21 +187,6 @@ namespace OpenRCT2 [[nodiscard]] IContext* GetContext(); } // namespace OpenRCT2 -namespace -{ - // The number of logical update / ticks per second. - constexpr uint32_t kGameUpdateFPS = 40; - // The maximum amount of updates in case rendering is slower - constexpr uint32_t kGameMaxUpdates = 4; - // The game update interval in milliseconds, (1000 / 40fps) = 25ms - constexpr float kGameUpdateTimeMS = 1.0f / kGameUpdateFPS; - // The maximum threshold to advance. - constexpr float kGameUpdateMaxThreshold = kGameUpdateTimeMS * kGameMaxUpdates; -}; // namespace - -constexpr float kGameMinTimeScale = 0.1f; -constexpr float kGameMaxTimeScale = 5.0f; - void ContextInit(); void ContextSetCurrentCursor(CursorID cursor); void ContextUpdateCursorScale(); diff --git a/src/openrct2/Game.h b/src/openrct2/Game.h index 68ef7e65df..9b08cf16c3 100644 --- a/src/openrct2/Game.h +++ b/src/openrct2/Game.h @@ -16,7 +16,19 @@ namespace OpenRCT2 { class Intent; -} + + // The number of logical update / ticks per second. + constexpr uint32_t kGameUpdateFPS = 40; + // The maximum amount of updates in case rendering is slower + constexpr uint32_t kGameMaxUpdates = 4; + // The game update interval in milliseconds, (1000 / 40fps) = 25ms + constexpr float kGameUpdateTimeMS = 1.0f / kGameUpdateFPS; + // The maximum threshold to advance. + constexpr float kGameUpdateMaxThreshold = kGameUpdateTimeMS * kGameMaxUpdates; + + constexpr float kGameMinTimeScale = 0.1f; + constexpr float kGameMaxTimeScale = 5.0f; +} // namespace OpenRCT2 struct ParkLoadResult; diff --git a/src/openrct2/scenes/title/Command/Wait.cpp b/src/openrct2/scenes/title/Command/Wait.cpp index e2876ebc78..b754bb1072 100644 --- a/src/openrct2/scenes/title/Command/Wait.cpp +++ b/src/openrct2/scenes/title/Command/Wait.cpp @@ -9,7 +9,7 @@ #include "Wait.h" -#include "../../../Context.h" +#include "../../../Game.h" namespace OpenRCT2::Title {