From e3c4c92d1e5ccb0e26e3609d21dddf6211afe0e5 Mon Sep 17 00:00:00 2001 From: Pavel Stupnikov Date: Thu, 11 Feb 2016 03:04:28 +0300 Subject: [PATCH] allow "player"s to create companies, disable resetme ban (both fix registering 6/6 error) --- cm_changelog.txt | 1 + src/cargo_table_gui.cpp | 6 ------ src/toolbar_gui.cpp | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cm_changelog.txt b/cm_changelog.txt index 74c63d6b10..5425031039 100644 --- a/cm_changelog.txt +++ b/cm_changelog.txt @@ -78,6 +78,7 @@ This is usable for any OpenTTD servers - Added active stations highlight to town zoning. Outlines stations that have been serviced in last ~50 days (as in checks for authority rating and town growth rate). - Fixed next counter in town window (was always showing -1 in case of custom growth rate). - Detailed station ratings tooltip (hover over rating in station window). +- Make cargo window look better, especially in double/quad interface size. *** 1.5.3 (3 Dec 2015) *** - Update to OpenTTD 1.5.3 diff --git a/src/cargo_table_gui.cpp b/src/cargo_table_gui.cpp index 506e4c9da4..21850d5060 100644 --- a/src/cargo_table_gui.cpp +++ b/src/cargo_table_gui.cpp @@ -209,9 +209,6 @@ static const NWidgetPart _nested_cargos_widgets[] = { NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_CT_HEADER_CARGO), SetFill(1, 0), SetPadding(2,2,2,2), SetDataTip(STR_TOOLBAR_CARGOS_HEADER_CARGO, STR_TOOLBAR_CARGOS_HEADER_CARGO), NWidget(WWT_TEXT, COLOUR_GREY, WID_CT_HEADER_AMOUNT), SetMinimalSize(108, 16), SetFill(1, 0), SetPadding(2,2,2,2), SetDataTip(STR_NULL, STR_NULL), NWidget(WWT_TEXT, COLOUR_GREY, WID_CT_HEADER_INCOME), SetMinimalSize(108, 16), SetFill(1, 0), SetPadding(2,2,2,2), SetDataTip(STR_NULL, STR_NULL), - // NWidget(NWID_VERTICAL), - // NWidget(NWID_SPACER), SetFill(0, 1), SetResize(0, 1), - // EndContainer(), EndContainer(), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), SetResize(1, 1), @@ -219,9 +216,6 @@ static const NWidgetPart _nested_cargos_widgets[] = { NWidget(WWT_EMPTY, COLOUR_GREY, WID_CT_LIST),SetFill(1, 0), SetPadding(2,2,2,2), SetResize(1, 1), NWidget(WWT_EMPTY, COLOUR_GREY, WID_CT_AMOUNT),SetMinimalSize(108, 0),SetFill(1, 0), SetPadding(2,2,2,2), SetResize(1, 1), NWidget(WWT_EMPTY, COLOUR_GREY, WID_CT_INCOME),SetMinimalSize(108, 0),SetFill(1, 0), SetPadding(2,2,2,2), SetResize(1, 1), - // NWidget(NWID_VERTICAL), - // NWidget(NWID_SPACER), SetFill(0, 1), SetResize(0, 1), - // EndContainer(), EndContainer(), EndContainer(), }; diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 735345c188..c460e55542 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1833,7 +1833,7 @@ struct MainToolbarWindow : Window { case MTHK_ZOOMEDIN_SCREENSHOT: MenuClickLargeWorldScreenshot(SC_ZOOMEDIN); break; case MTHK_DEFAULTZOOM_SCREENSHOT: MenuClickLargeWorldScreenshot(SC_DEFAULTZOOM); break; case MTHK_GIANT_SCREENSHOT: MenuClickLargeWorldScreenshot(SC_WORLD); break; - case MTHK_CHEATS: if (!_networking) ShowCheatWindow(); break; + case MTHK_CHEATS: ShowCheatWindow(); break; case MTHK_TERRAFORM: ShowTerraformToolbar(); break; case MTHK_EXTRA_VIEWPORT: ShowExtraViewPortWindowForTileUnderCursor(); break; #ifdef ENABLE_NETWORK