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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	cmake/SourceList.cmake
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/depot_base.h
#	src/elrail.cpp
#	src/network/core/udp.cpp
#	src/network/network_admin.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_storage.h
#	src/os/unix/crashlog_unix.cpp
#	src/rail.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/road_map.h
#	src/saveload/labelmaps_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/settings/world_settings.ini
#	src/tests/test_script_admin.cpp
#	src/textfile_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2023-11-19 12:19:17 +00:00
parent 625ecbe58c 30eba33f1e
commit c929f7075e
230 changed files with 2458 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/network_gui.cpp
View File

@@ -1030,7 +1030,7 @@ static WindowDesc _network_game_window_desc(
WDP_CENTER, "list_servers", 1000, 730,
WC_NETWORK_WINDOW, WC_NONE,
WDF_NETWORK,
_nested_network_game_widgets, lengthof(_nested_network_game_widgets)
std::begin(_nested_network_game_widgets), std::end(_nested_network_game_widgets)
);
void ShowNetworkGameWindow()
@@ -1303,7 +1303,7 @@ static WindowDesc _network_start_server_window_desc(
WDP_CENTER, nullptr, 0, 0,
WC_NETWORK_WINDOW, WC_NONE,
WDF_NETWORK,
_nested_network_start_server_window_widgets, lengthof(_nested_network_start_server_window_widgets)
std::begin(_nested_network_start_server_window_widgets), std::end(_nested_network_start_server_window_widgets)
);
static void ShowNetworkStartServerWindow()
@@ -1382,7 +1382,7 @@ static WindowDesc _client_list_desc(
WDP_AUTO, "list_clients", 220, 300,
WC_CLIENT_LIST, WC_NONE,
WDF_NETWORK,
_nested_client_list_widgets, lengthof(_nested_client_list_widgets)
std::begin(_nested_client_list_widgets), std::end(_nested_client_list_widgets)
);
/**
@@ -2297,7 +2297,7 @@ static WindowDesc _network_join_status_window_desc(
WDP_CENTER, nullptr, 0, 0,
WC_NETWORK_STATUS_WINDOW, WC_NONE,
WDF_MODAL | WDF_NETWORK,
_nested_network_join_status_window_widgets, lengthof(_nested_network_join_status_window_widgets)
std::begin(_nested_network_join_status_window_widgets), std::end(_nested_network_join_status_window_widgets)
);
void ShowJoinStatusWindow()
@@ -2419,7 +2419,7 @@ static WindowDesc _network_company_password_window_desc(
WDP_AUTO, nullptr, 0, 0,
WC_COMPANY_PASSWORD_WINDOW, WC_NONE,
WDF_NETWORK,
_nested_network_company_password_window_widgets, lengthof(_nested_network_company_password_window_widgets)
std::begin(_nested_network_company_password_window_widgets), std::end(_nested_network_company_password_window_widgets)
);
void ShowNetworkCompanyPasswordWindow(Window *parent)
@@ -2522,7 +2522,7 @@ static WindowDesc _network_ask_relay_desc(
WDP_CENTER, nullptr, 0, 0,
WC_NETWORK_ASK_RELAY, WC_NONE,
WDF_MODAL | WDF_NETWORK,
_nested_network_ask_relay_widgets, lengthof(_nested_network_ask_relay_widgets)
std::begin(_nested_network_ask_relay_widgets), std::end(_nested_network_ask_relay_widgets)
);
/**
@@ -2620,7 +2620,7 @@ static WindowDesc _network_ask_survey_desc(
WDP_CENTER, nullptr, 0, 0,
WC_NETWORK_ASK_SURVEY, WC_NONE,
WDF_MODAL,
_nested_network_ask_survey_widgets, lengthof(_nested_network_ask_survey_widgets)
std::begin(_nested_network_ask_survey_widgets), std::end(_nested_network_ask_survey_widgets)
);
/**