Merge remote-tracking branch 'upstream/master'

2024-03-17 01:25:55 +07:00
parent faa0cecd07 e7a0cb83c5
commit 47bc4b514f
164 changed files with 9321 additions and 6017 deletions
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -490,7 +490,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;