dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change _scaled_tick_counter to uint64

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-12-11 00:04:12 +00:00
parent ce9ccdb72a
commit f4d775cad3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/date.cpp
View File

@@ -31,7 +31,7 @@ Date _date; ///< Current date in days (day counter)
DateFract _date_fract; ///< Fractional part of the day. DateFract _date_fract; ///< Fractional part of the day.
uint64 _tick_counter; ///< Ever incrementing tick counter for setting off various events uint64 _tick_counter; ///< Ever incrementing tick counter for setting off various events
uint8 _tick_skip_counter; ///< Counter for ticks, when only vehicles are moving and nothing else happens uint8 _tick_skip_counter; ///< Counter for ticks, when only vehicles are moving and nothing else happens
uint32 _scaled_tick_counter; ///< Tick counter in daylength-scaled ticks uint64 _scaled_tick_counter; ///< Tick counter in daylength-scaled ticks
DateTicksScaled _scaled_date_ticks; ///< Date as ticks in daylength-scaled ticks DateTicksScaled _scaled_date_ticks; ///< Date as ticks in daylength-scaled ticks
uint32 _quit_after_days; ///< Quit after this many days of run time uint32 _quit_after_days; ///< Quit after this many days of run time
@@ -63,7 +63,7 @@ void SetDate(Date date, DateFract fract)
void SetScaledTickVariables() void SetScaledTickVariables()
{ {
_scaled_date_ticks = ((((DateTicksScaled)_date * DAY_TICKS) + _date_fract) * _settings_game.economy.day_length_factor) + _tick_skip_counter; _scaled_date_ticks = ((((DateTicksScaled)_date * DAY_TICKS) + _date_fract) * _settings_game.economy.day_length_factor) + _tick_skip_counter;
_scaled_tick_counter = (uint32)((_tick_counter * _settings_game.economy.day_length_factor) + _tick_skip_counter); _scaled_tick_counter = (uint64)((_tick_counter * _settings_game.economy.day_length_factor) + _tick_skip_counter);
} }
#define M(a, b) ((a << 5) | b) #define M(a, b) ((a << 5) | b)

2
src/date_func.h
View File

@@ -17,7 +17,7 @@ extern Date _date;
extern DateFract _date_fract; extern DateFract _date_fract;
extern uint64 _tick_counter; extern uint64 _tick_counter;
extern uint8 _tick_skip_counter; extern uint8 _tick_skip_counter;
extern uint32 _scaled_tick_counter; extern uint64 _scaled_tick_counter;
extern DateTicksScaled _scaled_date_ticks; extern DateTicksScaled _scaled_date_ticks;
extern uint32 _quit_after_days; extern uint32 _quit_after_days;

2
src/vehicle.cpp
View File

@@ -1474,7 +1474,7 @@ void CallVehicleTicks()
Vehicle *v = nullptr; Vehicle *v = nullptr;
SCOPE_INFO_FMT([&v], "CallVehicleTicks -> OnPeriodic: %s", scope_dumper().VehicleInfo(v)); SCOPE_INFO_FMT([&v], "CallVehicleTicks -> OnPeriodic: %s", scope_dumper().VehicleInfo(v));
for (size_t i = _scaled_tick_counter & 0x1FF; i < Vehicle::GetPoolSize(); i += 0x200) { for (size_t i = (size_t)(_scaled_tick_counter & 0x1FF); i < Vehicle::GetPoolSize(); i += 0x200) {
v = Vehicle::Get(i); v = Vehicle::Get(i);
if (v == nullptr) continue; if (v == nullptr) continue;