Merge branch 'master' into jgrpp
# 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:
@@ -98,7 +98,7 @@ static WindowDesc _normal_news_desc(
|
||||
WDP_MANUAL, nullptr, 0, 0,
|
||||
WC_NEWS_WINDOW, WC_NONE,
|
||||
0,
|
||||
_nested_normal_news_widgets, lengthof(_nested_normal_news_widgets)
|
||||
std::begin(_nested_normal_news_widgets), std::end(_nested_normal_news_widgets)
|
||||
);
|
||||
|
||||
/* New vehicles news items. */
|
||||
@@ -125,7 +125,7 @@ static WindowDesc _vehicle_news_desc(
|
||||
WDP_MANUAL, nullptr, 0, 0,
|
||||
WC_NEWS_WINDOW, WC_NONE,
|
||||
0,
|
||||
_nested_vehicle_news_widgets, lengthof(_nested_vehicle_news_widgets)
|
||||
std::begin(_nested_vehicle_news_widgets), std::end(_nested_vehicle_news_widgets)
|
||||
);
|
||||
|
||||
/* Company news items. */
|
||||
@@ -153,7 +153,7 @@ static WindowDesc _company_news_desc(
|
||||
WDP_MANUAL, nullptr, 0, 0,
|
||||
WC_NEWS_WINDOW, WC_NONE,
|
||||
0,
|
||||
_nested_company_news_widgets, lengthof(_nested_company_news_widgets)
|
||||
std::begin(_nested_company_news_widgets), std::end(_nested_company_news_widgets)
|
||||
);
|
||||
|
||||
/* Thin news items. */
|
||||
@@ -176,7 +176,7 @@ static WindowDesc _thin_news_desc(
|
||||
WDP_MANUAL, nullptr, 0, 0,
|
||||
WC_NEWS_WINDOW, WC_NONE,
|
||||
0,
|
||||
_nested_thin_news_widgets, lengthof(_nested_thin_news_widgets)
|
||||
std::begin(_nested_thin_news_widgets), std::end(_nested_thin_news_widgets)
|
||||
);
|
||||
|
||||
/* Small news items. */
|
||||
@@ -202,7 +202,7 @@ static WindowDesc _small_news_desc(
|
||||
WDP_MANUAL, nullptr, 0, 0,
|
||||
WC_NEWS_WINDOW, WC_NONE,
|
||||
0,
|
||||
_nested_small_news_widgets, lengthof(_nested_small_news_widgets)
|
||||
std::begin(_nested_small_news_widgets), std::end(_nested_small_news_widgets)
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -1239,7 +1239,7 @@ static WindowDesc _message_history_desc(
|
||||
WDP_AUTO, "list_news", 400, 140,
|
||||
WC_MESSAGE_HISTORY, WC_NONE,
|
||||
0,
|
||||
_nested_message_history, lengthof(_nested_message_history)
|
||||
std::begin(_nested_message_history), std::end(_nested_message_history)
|
||||
);
|
||||
|
||||
/** Display window with news messages history */
|
||||
|
Reference in New Issue
Block a user