mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 02:35:46 +01:00
Code Issues Releases Wiki Activity

Change widget order for land rights checkboxes (#23932)

Browse Source
This commit is contained in:
Aaron van Geffen
2025-03-05 14:52:09 +01:00
committed by GitHub
parent 7d9e3e200e
commit 65524bfe96
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -1,5 +1,6 @@
0.4.21 (in development)
------------------------------------------------------------------------
- Change: [#23932] The land rights window now checks 'Land Owned' by default.
- Fix: [#4225] Ride Construction window offers non-existent banked sloped to level curve (original bug).
- Fix: [#10379] Banners outside the park can be renamed and modified (original bug).
- Fix: [#23743] Parks with guest goals over 32767 do not appear in the scenario list.

24
src/openrct2-ui/windows/LandRights.cpp
View File

@@ -50,11 +50,11 @@ namespace OpenRCT2::Ui::Windows
WIDX_BUY_CONSTRUCTION_RIGHTS,
// Editor/sandbox widgets
WIDX_UNOWNED_LAND_CHECKBOX,
WIDX_LAND_SALE_CHECKBOX,
WIDX_LAND_OWNED_CHECKBOX,
WIDX_CONSTRUCTION_RIGHTS_SALE_CHECKBOX,
WIDX_LAND_SALE_CHECKBOX,
WIDX_CONSTRUCTION_RIGHTS_OWNED_CHECKBOX,
WIDX_CONSTRUCTION_RIGHTS_SALE_CHECKBOX,
WIDX_UNOWNED_LAND_CHECKBOX,
};
// clang-format off
@@ -65,11 +65,11 @@ namespace OpenRCT2::Ui::Windows
MakeRemapWidget({ 54, 32}, { 16, 16}, WindowWidgetType::TrnBtn, WindowColour::Primary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_RIGHTS_TIP ), // increment size
MakeRemapWidget({ 22, 53}, { 24, 24}, WindowWidgetType::ImgBtn, WindowColour::Primary, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_RIGHTS_TIP ), // land rights
MakeRemapWidget({ 52, 53}, { 24, 24}, WindowWidgetType::ImgBtn, WindowColour::Primary, SPR_BUY_CONSTRUCTION_RIGHTS, STR_BUY_CONSTRUCTION_RIGHTS_TIP ), // construction rights
MakeWidget ({100, 22}, {170, 12}, WindowWidgetType::Empty, WindowColour::Primary, STR_LAND_NOT_OWNED, STR_SET_LAND_TO_BE_NOT_OWNED_TIP ),
MakeWidget ({100, 22}, {170, 12}, WindowWidgetType::Empty, WindowColour::Primary, STR_LAND_OWNED, STR_SET_LAND_TO_BE_OWNED_TIP ),
MakeWidget ({100, 38}, {170, 12}, WindowWidgetType::Empty, WindowColour::Primary, STR_LAND_SALE, STR_SET_LAND_TO_BE_AVAILABLE_TIP ),
MakeWidget ({100, 54}, {170, 12}, WindowWidgetType::Empty, WindowColour::Primary, STR_LAND_OWNED, STR_SET_LAND_TO_BE_OWNED_TIP ),
MakeWidget ({100, 54}, {170, 12}, WindowWidgetType::Empty, WindowColour::Primary, STR_CONSTRUCTION_RIGHTS_OWNED, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP ),
MakeWidget ({100, 70}, {170, 12}, WindowWidgetType::Empty, WindowColour::Primary, STR_CONSTRUCTION_RIGHTS_SALE, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP),
MakeWidget ({100, 86}, {170, 12}, WindowWidgetType::Empty, WindowColour::Primary, STR_CONSTRUCTION_RIGHTS_OWNED, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP ),
MakeWidget ({100, 86}, {170, 12}, WindowWidgetType::Empty, WindowColour::Primary, STR_LAND_NOT_OWNED, STR_SET_LAND_TO_BE_NOT_OWNED_TIP ),
};
// clang-format on
@@ -80,15 +80,15 @@ namespace OpenRCT2::Ui::Windows
BuyConstructionRights,
// Sandbox/editor mode
SetLandUnowned,
SetLandForSale,
SetLandOwned,
SetConstructionRightsForSale,
SetLandForSale,
SetConstructionRightsOwned,
SetConstructionRightsForSale,
SetLandUnowned,
};
static const bool kLandRightsVisibleByMode[] = { true, false, true, true, true, false, false };
static const bool kConstructionRightsVisibleByMode[] = { false, true, true, false, false, true, true };
static const bool kLandRightsVisibleByMode[] = { true, false, true, true, false, false, true };
static const bool kConstructionRightsVisibleByMode[] = { false, true, false, false, true, true, true };
class LandRightsWindow final : public Window
{
@@ -143,7 +143,7 @@ namespace OpenRCT2::Ui::Windows
}
else
{
SwitchToMode(LandRightsMode::SetLandUnowned);
SwitchToMode(LandRightsMode::SetLandOwned);
}
}