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

Feature: Use real-time "wallclock" timekeeping units (#11341)

Browse Source
This commit is contained in:
Tyler Trahan
2024-01-23 11:36:09 -05:00
committed by GitHub
parent bbdbf9a589
commit fd9e72a7e7
30 changed files with 546 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/settings_table.cpp
View File

@@ -130,7 +130,7 @@ static void UpdateConsists(int32_t)
/**
* Check and update if needed all vehicle service intervals.
* @param new_value Contains 0 if service intervals are in days, otherwise intervals use percents.
* @param new_value Contains 0 if service intervals are in time (days or real-world minutes), otherwise intervals use percents.
*/
static void UpdateAllServiceInterval(int32_t new_value)
{
@@ -150,6 +150,12 @@ static void UpdateAllServiceInterval(int32_t new_value)
vds->servint_roadveh = DEF_SERVINT_PERCENT;
vds->servint_aircraft = DEF_SERVINT_PERCENT;
vds->servint_ships = DEF_SERVINT_PERCENT;
} else if (TimerGameEconomy::UsingWallclockUnits(_game_mode == GM_MENU)) {
/* Service intervals are in minutes. */
vds->servint_trains = DEF_SERVINT_MINUTES_TRAINS;
vds->servint_roadveh = DEF_SERVINT_MINUTES_ROADVEH;
vds->servint_aircraft = DEF_SERVINT_MINUTES_AIRCRAFT;
vds->servint_ships = DEF_SERVINT_MINUTES_SHIPS;
} else {
/* Service intervals are in days. */
vds->servint_trains = DEF_SERVINT_DAYS_TRAINS;
@@ -483,4 +489,28 @@ static void UpdateClientConfigValues()
}
}
/**
* Callback for when the player changes the timekeeping units.
* @param Unused.
*/
static void ChangeTimekeepingUnits(int32_t)
{
/* If service intervals are in time units (calendar days or real-world minutes), reset them to the correct defaults. */
if (!_settings_client.company.vehicle.servint_ispercent) {
UpdateAllServiceInterval(0);
}
InvalidateWindowClassesData(WC_GAME_OPTIONS, 0);
}
/**
* Pre-callback check when trying to change the timetable mode. This is locked to Seconds when using wallclock units.
* @param Unused.
* @return True if we allow changing the timetable mode.
*/
static bool CanChangeTimetableMode(int32_t &)
{
return !TimerGameEconomy::UsingWallclockUnits();
}
/* End - Callback Functions */