mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Replace hardcoded value in various windows

Browse Source
This commit is contained in:
Broxzier
2017-03-11 21:29:05 +01:00
parent f9e2a74c4d
commit 4cd39babbb
4 changed files with 106 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/openrct2/windows/editor_scenario_options.c
View File

@@ -308,16 +308,74 @@ static rct_window_event_list *window_editor_scenario_options_page_events[] = {
#pragma region Enabled widgets
#define ALWAYS_ENABLED_WIDGETS \
(1ULL << WIDX_CLOSE) |\
(1ULL << WIDX_TAB_1) |\
(1ULL << WIDX_TAB_2) |\
(1ULL << WIDX_TAB_3)
static uint64 window_editor_scenario_options_page_enabled_widgets[] = {
0x001DB6F4,
0x001EDB74,
0x007F7B74
ALWAYS_ENABLED_WIDGETS |
(1ULL << WIDX_NO_MONEY) |
(1ULL << WIDX_INITIAL_CASH_INCREASE) |
(1ULL << WIDX_INITIAL_CASH_DECREASE) |
(1ULL << WIDX_INITIAL_LOAN_INCREASE) |
(1ULL << WIDX_INITIAL_LOAN_DECREASE) |
(1ULL << WIDX_MAXIMUM_LOAN_INCREASE) |
(1ULL << WIDX_MAXIMUM_LOAN_DECREASE) |
(1ULL << WIDX_INTEREST_RATE_INCREASE) |
(1ULL << WIDX_INTEREST_RATE_DECREASE) |
(1ULL << WIDX_FORBID_MARKETING),
ALWAYS_ENABLED_WIDGETS |
(1ULL << WIDX_CASH_PER_GUEST_INCREASE) |
(1ULL << WIDX_CASH_PER_GUEST_DECREASE) |
(1ULL << WIDX_GUEST_INITIAL_HAPPINESS_INCREASE) |
(1ULL << WIDX_GUEST_INITIAL_HAPPINESS_DECREASE) |
(1ULL << WIDX_GUEST_INITIAL_HUNGER_INCREASE) |
(1ULL << WIDX_GUEST_INITIAL_HUNGER_DECREASE) |
(1ULL << WIDX_GUEST_INITIAL_THIRST_INCREASE) |
(1ULL << WIDX_GUEST_INITIAL_THIRST_DECREASE) |
(1ULL << WIDX_GUEST_PREFER_LESS_INTENSE_RIDES) |
(1ULL << WIDX_GUEST_PREFER_MORE_INTENSE_RIDES),
ALWAYS_ENABLED_WIDGETS |
(1ULL << WIDX_LAND_COST_INCREASE) |
(1ULL << WIDX_LAND_COST_DECREASE) |
(1ULL << WIDX_CONSTRUCTION_RIGHTS_COST_INCREASE) |
(1ULL << WIDX_CONSTRUCTION_RIGHTS_COST_DECREASE) |
(1ULL << WIDX_PAY_FOR_PARK_OR_RIDES) |
(1ULL << WIDX_PAY_FOR_PARK_OR_RIDES_DROPDOWN) |
(1ULL << WIDX_ENTRY_PRICE_INCREASE) |
(1ULL << WIDX_ENTRY_PRICE_DECREASE) |
(1ULL << WIDX_FORBID_TREE_REMOVAL) |
(1ULL << WIDX_FORBID_LANDSCAPE_CHANGES) |
(1ULL << WIDX_FORBID_HIGH_CONSTRUCTION) |
(1ULL << WIDX_HARD_PARK_RATING) |
(1ULL << WIDX_HARD_GUEST_GENERATION)
};
static uint32 window_editor_scenario_options_page_hold_down_widgets[] = {
0x000DB600,
0x0006DB00,
0x00031B00
(1ULL << WIDX_INITIAL_CASH_INCREASE) |
(1ULL << WIDX_INITIAL_CASH_DECREASE) |
(1ULL << WIDX_INITIAL_LOAN_INCREASE) |
(1ULL << WIDX_INITIAL_LOAN_DECREASE) |
(1ULL << WIDX_MAXIMUM_LOAN_INCREASE) |
(1ULL << WIDX_MAXIMUM_LOAN_DECREASE) |
(1ULL << WIDX_INTEREST_RATE_INCREASE) |
(1ULL << WIDX_INTEREST_RATE_DECREASE),
(1ULL << WIDX_CASH_PER_GUEST_INCREASE) |
(1ULL << WIDX_CASH_PER_GUEST_DECREASE) |
(1ULL << WIDX_GUEST_INITIAL_HAPPINESS_INCREASE) |
(1ULL << WIDX_GUEST_INITIAL_HAPPINESS_DECREASE) |
(1ULL << WIDX_GUEST_INITIAL_HUNGER_INCREASE) |
(1ULL << WIDX_GUEST_INITIAL_HUNGER_DECREASE) |
(1ULL << WIDX_GUEST_INITIAL_THIRST_INCREASE) |
(1ULL << WIDX_GUEST_INITIAL_THIRST_DECREASE),
(1ULL << WIDX_LAND_COST_INCREASE) |
(1ULL << WIDX_LAND_COST_DECREASE) |
(1ULL << WIDX_CONSTRUCTION_RIGHTS_COST_INCREASE) |
(1ULL << WIDX_CONSTRUCTION_RIGHTS_COST_DECREASE) |
(1ULL << WIDX_ENTRY_PRICE_INCREASE) |
(1ULL << WIDX_ENTRY_PRICE_DECREASE)
};
#pragma endregion

11
src/openrct2/windows/maze_construction.c
View File

@@ -141,7 +141,16 @@ rct_window *window_maze_construction_open()
{
rct_window *w = window_create(0, 29, 166, 200, &window_maze_construction_events, WC_RIDE_CONSTRUCTION, WF_NO_AUTO_CLOSE);
w->widgets = window_maze_construction_widgets;
w->enabled_widgets = 0x6F0001C4;
w->enabled_widgets = (1ULL << WIDX_CLOSE) |
(1ULL << WIDX_MAZE_BUILD_MODE) |
(1ULL << WIDX_MAZE_MOVE_MODE) |
(1ULL << WIDX_MAZE_FILL_MODE) |
(1ULL << WIDX_MAZE_DIRECTION_NW) |
(1ULL << WIDX_MAZE_DIRECTION_NE) |
(1ULL << WIDX_MAZE_DIRECTION_SW) |
(1ULL << WIDX_MAZE_DIRECTION_SE) |
(1ULL << WIDX_MAZE_ENTRANCE) |
(1ULL << WIDX_MAZE_EXIT);
window_init_scroll_widgets(w);
colour_scheme_update(w);

32
src/openrct2/windows/ride_construction.c
View File

@@ -553,7 +553,37 @@ rct_window *window_ride_construction_open()
w = window_create(0, 29, 166, 394, &window_ride_construction_events, WC_RIDE_CONSTRUCTION, WF_NO_AUTO_CLOSE);
w->widgets = window_ride_construction_widgets;
w->enabled_widgets = 0x67EFFFFFC4;
w->enabled_widgets = (1ULL << WIDX_CLOSE) |
(1ULL << WIDX_LEFT_CURVE_VERY_SMALL) |
(1ULL << WIDX_LEFT_CURVE_SMALL) |
(1ULL << WIDX_LEFT_CURVE) |
(1ULL << WIDX_STRAIGHT) |
(1ULL << WIDX_RIGHT_CURVE) |
(1ULL << WIDX_RIGHT_CURVE_SMALL) |
(1ULL << WIDX_RIGHT_CURVE_VERY_SMALL) |
(1ULL << WIDX_SPECIAL_TRACK_DROPDOWN) |
(1ULL << WIDX_SLOPE_DOWN_STEEP) |
(1ULL << WIDX_SLOPE_DOWN) |
(1ULL << WIDX_LEVEL) |
(1ULL << WIDX_SLOPE_UP) |
(1ULL << WIDX_SLOPE_UP_STEEP) |
(1ULL << WIDX_CHAIN_LIFT) |
(1ULL << WIDX_BANK_LEFT) |
(1ULL << WIDX_BANK_STRAIGHT) |
(1ULL << WIDX_BANK_RIGHT) |
(1ULL << WIDX_CONSTRUCT) |
(1ULL << WIDX_DEMOLISH) |
(1ULL << WIDX_LEFT_CURVE_LARGE) |
(1ULL << WIDX_PREVIOUS_SECTION) |
(1ULL << WIDX_NEXT_SECTION) |
(1ULL << WIDX_ENTRANCE) |
(1ULL << WIDX_EXIT) |
(1ULL << WIDX_RIGHT_CURVE_LARGE) |
(1ULL << WIDX_ROTATE) |
(1ULL << WIDX_U_TRACK) |
(1ULL << WIDX_O_TRACK) |
(1ULL << WIDX_SEAT_ROTATION_ANGLE_SPINNER_UP) |
(1ULL << WIDX_SEAT_ROTATION_ANGLE_SPINNER_DOWN);
window_init_scroll_widgets(w);

2
src/openrct2/windows/shortcut_key_change.c
View File

@@ -84,7 +84,7 @@ void window_shortcut_change_open(sint32 selected_key){
rct_window* w = window_create_centred(WW, WH, &window_shortcut_change_events, WC_CHANGE_KEYBOARD_SHORTCUT, 0);
w->widgets = window_shortcut_change_widgets;
w->enabled_widgets = (1 << 2);
w->enabled_widgets = (1ULL << WIDX_CLOSE);
window_init_scroll_widgets(w);
}