Merge pull request #1882 from LRFLEW/issue-1873

Disable chain button on steep slopes that cannot have one
This commit is contained in:
Ted John 2015-12-28 00:07:51 +00:00
commit 568dcf07f1
1 changed files with 6 additions and 1 deletions

View File

@ -493,7 +493,7 @@ static int ride_get_alternative_type(rct_ride *ride)
{
return _currentTrackCovered & 2 ?
RCT2_ADDRESS(0x0097D4F5, uint8)[ride->type * 8] :
ride->type;;
ride->type;
}
/**
@ -945,6 +945,11 @@ static void window_ride_construction_resize(rct_window *w)
if (_currentTrackSlopeEnd == TRACK_SLOPE_UP_90 || _previousTrackSlopeEnd == TRACK_SLOPE_UP_90) {
disabledWidgets |= (1ULL << WIDX_CHAIN_LIFT);
}
if (!is_track_enabled(TRACK_LIFT_HILL_STEEP)) {
if (_previousTrackSlopeEnd == TRACK_SLOPE_UP_60 || _currentTrackSlopeEnd == TRACK_SLOPE_UP_60) {
disabledWidgets |= (1ULL << WIDX_CHAIN_LIFT);
}
}
if (_previousTrackBankEnd == TRACK_BANK_UPSIDE_DOWN) {
disabledWidgets |=
(1ULL << WIDX_LEFT_CURVE_SMALL) |