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

Fix issues due to comparing no money flag instead of 18

Browse Source
This commit is contained in:
Duncan Frost
2015-01-10 14:15:48 +00:00
parent 5859af1d1b
commit 4346f8c993
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/windows/editor_bottom_toolbar.c
View File

@@ -338,7 +338,7 @@ static void window_editor_bottom_toolbar_mouseup()
if (widgetIndex == WIDX_PREVIOUS_STEP_BUTTON) {
if ((RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) ||
RCT2_GLOBAL(0x13573C8, uint16) == 0x2710 && !(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY_SCENARIO)) {
RCT2_GLOBAL(0x13573C8, uint16) == 0x2710 && !(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_18)) {
previous_button_mouseup_events[g_editor_step]();
}
} else if (widgetIndex == WIDX_NEXT_STEP_BUTTON) {
@@ -385,7 +385,7 @@ void window_editor_bottom_toolbar_invalidate() {
} else if (g_editor_step == EDITOR_STEP_ROLLERCOASTER_DESIGNER) {
hide_next_step_button();
} else if (!(RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER)) {
if (RCT2_GLOBAL(0x13573C8, uint16) != 0x2710 || RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY_SCENARIO) {
if (RCT2_GLOBAL(0x13573C8, uint16) != 0x2710 || RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_18) {
hide_previous_step_button();
}
}
@@ -407,13 +407,17 @@ void window_editor_bottom_toolbar_paint() {
if (g_editor_step == EDITOR_STEP_OBJECT_SELECTION) {
drawNextButton = true;
} else if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) {
}
else if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) {
drawPreviousButton = true;
} else if (RCT2_GLOBAL(0x13573C8, uint16) != 0x2710) {
}
else if (RCT2_GLOBAL(0x13573C8, uint16) != 0x2710) {
drawNextButton = true;
} else if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY_SCENARIO) {
}
else if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_18) {
drawNextButton = true;
} else {
}
else {
drawPreviousButton = true;
}