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

Simplify timetable long duration hours and minutes suffix string

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-05-10 19:10:56 +01:00
parent 7941eb5187
commit 4c18a193e7
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/strings.cpp
View File

@@ -1585,21 +1585,19 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
int64 ratio = DATE_UNIT_SIZE;
int64 units = ticks / ratio;
int64 leftover = _settings_client.gui.timetable_leftover_ticks ? ticks % ratio : 0;
int64 args_array[1] = { units };
StringParameters tmp_params(args_array);
buff = FormatString(buff, GetStringPtr(str), &tmp_params, last);
if (b == SCC_TT_TICKS_LONG && _settings_time.time_in_minutes && units > 59) {
int64 hours = units / 60;
int64 minutes = units % 60;
int64 args_array[4] = {
units,
int64 args_array[3] = {
(minutes != 0) ? STR_TIMETABLE_HOURS_MINUTES : STR_TIMETABLE_HOURS,
hours,
minutes
};
StringParameters tmp_params(args_array);
buff = FormatString(buff, GetStringPtr(STR_TIMETABLE_MINUTES_LONG), &tmp_params, last);
} else {
int64 args_array[1] = { units };
StringParameters tmp_params(args_array);
buff = FormatString(buff, GetStringPtr(str), &tmp_params, last);
buff = FormatString(buff, GetStringPtr(STR_TIMETABLE_MINUTES_SUFFIX), &tmp_params, last);
}
if (leftover != 0) {
int64 args_array[1] = { leftover };