mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: Define a TickCounter variable type for TimerGameTick::counter

This commit is contained in:
Tyler Trahan 2023-11-20 12:00:34 -05:00
parent bc1d49ebf4
commit 3902acb13d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/timer/timer_game_tick.cpp
View File

@ -16,7 +16,7 @@
#include "../safeguards.h"
uint64_t TimerGameTick::counter = 0;
TimerGameTick::TickCounter TimerGameTick::counter = 0;
template<>
void IntervalTimer<TimerGameTick>::Elapsed(TimerGameTick::TElapsed delta)

3
src/timer/timer_game_tick.h
View File

@ -22,6 +22,7 @@
class TimerGameTick {
public:
using Ticks = int32_t; ///< The type to store ticks in
using TickCounter = uint64_t; ///< The type that the tick counter is stored in
using TPeriod = uint;
using TElapsed = uint;
@ -29,7 +30,7 @@ public:
uint elapsed;
};
static uint64_t counter; ///< Monotonic counter, in ticks, since start of game.
static TickCounter counter; ///< Monotonic counter, in ticks, since start of game.
};
/**

2
src/vehicle_base.h
View File

@ -331,7 +331,7 @@ public:
StationID last_station_visited; ///< The last station we stopped at.
StationID last_loading_station; ///< Last station the vehicle has stopped at and could possibly leave from with any cargo loaded.
uint64_t last_loading_tick; ///< Last time (based on TimerGameTick counter) the vehicle has stopped at a station and could possibly leave with any cargo loaded.
TimerGameTick::TickCounter last_loading_tick; ///< Last TimerGameTick::counter tick that the vehicle has stopped at a station and could possibly leave with any cargo loaded.
CargoID cargo_type; ///< type of cargo this vehicle is carrying
byte cargo_subtype; ///< Used for livery refits (NewGRF variations)