diff --git a/src/timer/timer_game_tick.h b/src/timer/timer_game_tick.h --- a/src/timer/timer_game_tick.h +++ b/src/timer/timer_game_tick.h @@ -14,9 +14,6 @@ #include -/** Estimation of how many ticks fit in a single second. */ -static const uint TICKS_PER_SECOND = 1000 / MILLISECONDS_PER_TICK; - /** * Timer that represents the game-ticks. It will pause when the game is paused. * @@ -24,6 +21,8 @@ static const uint TICKS_PER_SECOND = 100 */ class TimerGameTick { public: + using Ticks = int32_t; ///< The type to store ticks in + using TPeriod = uint; using TElapsed = uint; struct TStorage { @@ -33,4 +32,28 @@ public: static uint64_t counter; ///< Monotonic counter, in ticks, since start of game. }; +/** + * Storage class for Ticks constants. + */ +class Ticks { +public: + static constexpr TimerGameTick::Ticks INVALID_TICKS = -1; ///< Representation of an invalid number of ticks. + + /** + * 1 day is 74 ticks; TimerGameCalendar::date_fract used to be uint16_t and incremented by 885. On an overflow the new day begun and 65535 / 885 = 74. + * 1 tick is approximately 27 ms. + * 1 day is thus about 2 seconds (74 * 27 = 1998) on a machine that can run OpenTTD normally + */ + static constexpr TimerGameTick::Ticks DAY_TICKS = 74; ///< ticks per day + static constexpr TimerGameTick::Ticks TICKS_PER_SECOND = 1000 / MILLISECONDS_PER_TICK; ///< Estimation of how many ticks fit in a single second. + + static constexpr TimerGameTick::Ticks STATION_RATING_TICKS = 185; ///< Cycle duration for updating station rating. + static constexpr TimerGameTick::Ticks STATION_ACCEPTANCE_TICKS = 250; ///< Cycle duration for updating station acceptance. + static constexpr TimerGameTick::Ticks STATION_LINKGRAPH_TICKS = 504; ///< Cycle duration for cleaning dead links. + static constexpr TimerGameTick::Ticks CARGO_AGING_TICKS = 185; ///< Cycle duration for aging cargo. + static constexpr TimerGameTick::Ticks INDUSTRY_PRODUCE_TICKS = 256; ///< Cycle duration for industry production. + static constexpr TimerGameTick::Ticks TOWN_GROWTH_TICKS = 70; ///< Cycle duration for towns trying to grow (this originates from the size of the town array in TTD). + static constexpr TimerGameTick::Ticks INDUSTRY_CUT_TREE_TICKS = INDUSTRY_PRODUCE_TICKS * 2; ///< Cycle duration for lumber mill's extra action. +}; + #endif /* TIMER_GAME_TICK_H */