mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2883 from danidoedel/fix 

Fix two ride construction bugs
This commit is contained in:
Ted John 2016-02-10 18:49:46 +00:00
parent e3c20969ba 217047c1a6
commit 113631f7d2
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/windows/ride_construction.c
View File

@ -720,6 +720,12 @@ static void window_ride_construction_resize(rct_window *w)
(1ULL << WIDX_BANK_STRAIGHT) |
(1ULL << WIDX_BANK_RIGHT);
}
// Disable banking if the start track is steep and the end of the track becomes flat.
if ((_previousTrackSlopeEnd == TRACK_SLOPE_DOWN_60 || _previousTrackSlopeEnd == TRACK_SLOPE_UP_60) && _currentTrackSlopeEnd == TRACK_SLOPE_NONE) {
disabledWidgets |=
(1ULL << WIDX_BANK_LEFT) |
(1ULL << WIDX_BANK_RIGHT);
}
if (!is_track_enabled(TRACK_SLOPE) && !is_track_enabled(TRACK_SLOPE_STEEP)) {
if (rideType != RIDE_TYPE_REVERSE_FREEFALL_COASTER && rideType != RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER) {
// Disable all slopes
@ -2876,6 +2882,10 @@ static void window_ride_construction_update_widgets(rct_window *w)
window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].right = window_ride_construction_widgets[WIDX_SLOPE_DOWN].right;
window_ride_construction_widgets[WIDX_SLOPE_DOWN].right = tmp;
tmp = window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].left;
window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].left = window_ride_construction_widgets[WIDX_SLOPE_UP].left;
window_ride_construction_widgets[WIDX_SLOPE_UP].left = tmp;
tmp = window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].right;
window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].right = window_ride_construction_widgets[WIDX_SLOPE_UP].right;
window_ride_construction_widgets[WIDX_SLOPE_UP].right = tmp;