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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/base_media_base.h
#	src/base_media_func.h
#	src/build_vehicle_gui.cpp
#	src/dock_gui.cpp
#	src/main_gui.cpp
#	src/music_gui.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content.cpp
#	src/newgrf.cpp
#	src/newgrf_roadstop.cpp
#	src/os/windows/string_uniscribe.h
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/strings.cpp
#	src/terraform_gui.cpp
#	src/tests/test_script_admin.cpp
#	src/tests/test_window_desc.cpp
#	src/timer/timer_game_calendar.h
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/viewport.cpp
#	src/widget_type.h
#	src/window.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2023-11-29 20:32:54 +00:00
parent b10a22218f ab535c0a86
commit 88670a230f
154 changed files with 1094 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/graph_gui.cpp
View File

@@ -144,7 +144,7 @@ static const NWidgetPart _nested_graph_legend_widgets[] = {
EndContainer(),
};
static WindowDesc _graph_legend_desc(
static WindowDesc _graph_legend_desc(__FILE__, __LINE__,
WDP_AUTO, "graph_legend", 0, 0,
WC_GRAPH_LEGEND, WC_NONE,
0,
@@ -674,7 +674,7 @@ static const NWidgetPart _nested_operating_profit_widgets[] = {
EndContainer(),
};
static WindowDesc _operating_profit_desc(
static WindowDesc _operating_profit_desc(__FILE__, __LINE__,
WDP_AUTO, "graph_operating_profit", 0, 0,
WC_OPERATING_PROFIT, WC_NONE,
0,
@@ -725,7 +725,7 @@ static const NWidgetPart _nested_income_graph_widgets[] = {
EndContainer(),
};
static WindowDesc _income_graph_desc(
static WindowDesc _income_graph_desc(__FILE__, __LINE__,
WDP_AUTO, "graph_income", 0, 0,
WC_INCOME_GRAPH, WC_NONE,
0,
@@ -1032,7 +1032,7 @@ static const NWidgetPart _nested_delivered_cargo_graph_widgets[] = {
EndContainer(),
};
static WindowDesc _delivered_cargo_graph_desc(
static WindowDesc _delivered_cargo_graph_desc(__FILE__, __LINE__,
WDP_AUTO, "graph_delivered_cargo", 0, 0,
WC_DELIVERED_CARGO, WC_NONE,
0,
@@ -1088,7 +1088,7 @@ static const NWidgetPart _nested_performance_history_widgets[] = {
EndContainer(),
};
static WindowDesc _performance_history_desc(
static WindowDesc _performance_history_desc(__FILE__, __LINE__,
WDP_AUTO, "graph_performance", 0, 0,
WC_PERFORMANCE_HISTORY, WC_NONE,
0,
@@ -1137,7 +1137,7 @@ static const NWidgetPart _nested_company_value_graph_widgets[] = {
EndContainer(),
};
static WindowDesc _company_value_graph_desc(
static WindowDesc _company_value_graph_desc(__FILE__, __LINE__,
WDP_AUTO, "graph_company_value", 0, 0,
WC_COMPANY_VALUE, WC_NONE,
0,
@@ -1485,7 +1485,7 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = {
EndContainer(),
};
static WindowDesc _cargo_payment_rates_desc(
static WindowDesc _cargo_payment_rates_desc(__FILE__, __LINE__,
WDP_AUTO, "graph_cargo_payment_rates", 0, 0,
WC_PAYMENT_RATES, WC_NONE,
0,
@@ -1781,7 +1781,7 @@ static const NWidgetPart _nested_performance_rating_detail_widgets[] = {
NWidgetFunction(MakePerformanceDetailPanels),
};
static WindowDesc _performance_rating_detail_desc(
static WindowDesc _performance_rating_detail_desc(__FILE__, __LINE__,
WDP_AUTO, "league_details", 0, 0,
WC_PERFORMANCE_DETAIL, WC_NONE,
0,
@@ -2055,7 +2055,7 @@ static const NWidgetPart _nested_station_cargo_widgets[] = {
EndContainer(),
};
static WindowDesc _station_cargo_desc(
static WindowDesc _station_cargo_desc(__FILE__, __LINE__,
WDP_AUTO, "graph_station_cargo", 0, 0,
WC_STATION_CARGO, WC_NONE,
0,