Merge remote-tracking branch 'upstream/release/14' into 14

This commit is contained in:
2024-04-04 18:22:11 +01:00
187 changed files with 11016 additions and 7374 deletions

View File

@@ -486,7 +486,7 @@ void DepotSortList(VehicleList *list)
}
/** draw the vehicle profit button in the vehicle list window. */
static void DrawVehicleProfitButton(TimerGameCalendar::Date age, Money display_profit_last_year, uint num_vehicles, int x, int y)
static void DrawVehicleProfitButton(TimerGameEconomy::Date age, Money display_profit_last_year, uint num_vehicles, int x, int y)
{
SpriteID spr;