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

8
src/genworld_gui.cpp
View File

@@ -1150,14 +1150,14 @@ struct GenerateLandscapeWindow : public Window {
}
};
static WindowDesc _generate_landscape_desc(
static WindowDesc _generate_landscape_desc(__FILE__, __LINE__,
WDP_CENTER, nullptr, 0, 0,
WC_GENERATE_LANDSCAPE, WC_NONE,
0,
std::begin(_nested_generate_landscape_widgets), std::end(_nested_generate_landscape_widgets)
);
static WindowDesc _heightmap_load_desc(
static WindowDesc _heightmap_load_desc(__FILE__, __LINE__,
WDP_CENTER, nullptr, 0, 0,
WC_GENERATE_LANDSCAPE, WC_NONE,
0,
@@ -1460,7 +1460,7 @@ static const NWidgetPart _nested_create_scenario_widgets[] = {
EndContainer(),
};
static WindowDesc _create_scenario_desc(
static WindowDesc _create_scenario_desc(__FILE__, __LINE__,
WDP_CENTER, nullptr, 0, 0,
WC_GENERATE_LANDSCAPE, WC_NONE,
0,
@@ -1486,7 +1486,7 @@ static const NWidgetPart _nested_generate_progress_widgets[] = {
};
static WindowDesc _generate_progress_desc(
static WindowDesc _generate_progress_desc(__FILE__, __LINE__,
WDP_CENTER, nullptr, 0, 0,
WC_MODAL_PROGRESS, WC_NONE,
0,