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

Replace DATE_UNIT_SIZE macro with a function

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-02-07 20:12:39 +00:00
parent d39236d50c
commit d456f4a3a5
9 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/strings.cpp
View File

@@ -1587,10 +1587,10 @@ static void FormatString(StringBuilder builder, const char *str_arg, StringParam
FormatString(builder, GetStringPtr(STR_UNITS_TICKS), tmp_params);
} else {
StringID str = _settings_time.time_in_minutes ? STR_TIMETABLE_MINUTES : STR_UNITS_DAYS;
int64_t ticks = args.GetNextParameter<int64_t>();
int64_t ratio = DATE_UNIT_SIZE;
int64_t units = ticks / ratio;
int64_t leftover = _settings_client.gui.timetable_leftover_ticks ? ticks % ratio : 0;
const int64_t ticks = args.GetNextParameter<int64_t>();
const int64_t ratio = TimetableDisplayUnitSize();
const int64_t units = ticks / ratio;
const int64_t leftover = _settings_client.gui.timetable_leftover_ticks ? ticks % ratio : 0;
auto tmp_params = MakeParameters(units);
FormatString(builder, GetStringPtr(str), tmp_params);
if (b == SCC_TT_TICKS_LONG && _settings_time.time_in_minutes && units > 59) {