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

Name sub_6C9627()

Browse Source
This commit is contained in:
Richard Jenkins
2017-06-01 22:36:33 +01:00
committed by rwjuk
parent 7a4511e11a
commit d191aaa1ef
4 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/openrct2/ride/ride.c
View File

@@ -776,7 +776,7 @@ sint32 ride_find_track_gap(rct_xy_element *input, rct_xy_element *output)
w = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (w != NULL && _rideConstructionState != RIDE_CONSTRUCTION_STATE_0 && _currentRideIndex == rideIndex)
sub_6C9627();
ride_construction_invalidate_current_track();
bool counter = true;
track_circuit_iterator_begin(&it, *input);
@@ -972,7 +972,7 @@ static rct_window *ride_create_or_find_construction_window(sint32 rideIndex)
_currentRideIndex = rideIndex;
w = window_ride_construction_open();
} else {
sub_6C9627();
ride_construction_invalidate_current_track();
_currentRideIndex = rideIndex;
}
@@ -1401,7 +1401,7 @@ void sub_6C96C0()
}
}
void sub_6C9627()
void ride_construction_invalidate_current_track()
{
sint32 x, y, z;
@@ -1610,7 +1610,7 @@ void ride_construction_set_default_next_piece()
void ride_select_next_section()
{
if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_SELECTED) {
sub_6C9627();
ride_construction_invalidate_current_track();
sint32 x = _currentTrackBeginX;
sint32 y = _currentTrackBeginY;
sint32 z = _currentTrackBeginZ;
@@ -1666,7 +1666,7 @@ void ride_select_next_section()
void ride_select_previous_section()
{
if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_SELECTED) {
sub_6C9627();
ride_construction_invalidate_current_track();
sint32 x = _currentTrackBeginX;
sint32 y = _currentTrackBeginY;
sint32 z = _currentTrackBeginZ;
@@ -1735,7 +1735,7 @@ static sint32 ride_modify_entrance_or_exit(rct_map_element *mapElement, sint32 x
return 0;
}
sub_6C9627();
ride_construction_invalidate_current_track();
if (
_rideConstructionState != RIDE_CONSTRUCTION_STATE_ENTRANCE_EXIT ||
!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) ||
@@ -4099,7 +4099,7 @@ static sint32 ride_check_block_brakes(rct_xy_element *input, rct_xy_element *out
rideIndex = input->element->properties.track.ride_index;
w = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (w != NULL && _rideConstructionState != RIDE_CONSTRUCTION_STATE_0 && _currentRideIndex == rideIndex)
sub_6C9627();
ride_construction_invalidate_current_track();
track_circuit_iterator_begin(&it, *input);
while (track_circuit_iterator_next(&it)) {
@@ -4148,7 +4148,7 @@ static bool ride_check_track_contains_inversions(rct_xy_element *input, rct_xy_e
rct_window *w = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (w != NULL && _rideConstructionState != RIDE_CONSTRUCTION_STATE_0 && rideIndex == _currentRideIndex) {
sub_6C9627();
ride_construction_invalidate_current_track();
}
track_circuit_iterator it;
@@ -4179,7 +4179,7 @@ static bool ride_check_track_contains_banked(rct_xy_element *input, rct_xy_eleme
rct_window *w = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (w != NULL && _rideConstructionState != RIDE_CONSTRUCTION_STATE_0 && rideIndex == _currentRideIndex) {
sub_6C9627();
ride_construction_invalidate_current_track();
}
track_circuit_iterator it;
@@ -4204,7 +4204,7 @@ static sint32 ride_check_station_length(rct_xy_element *input, rct_xy_element *o
if (w != 0 &&
_rideConstructionState != RIDE_CONSTRUCTION_STATE_0 &&
_currentRideIndex == input->element->properties.track.ride_index){
sub_6C9627();
ride_construction_invalidate_current_track();
}
output->x = input->x;
@@ -4259,7 +4259,7 @@ static bool ride_check_start_and_end_is_station(rct_xy_element *input, rct_xy_el
w = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (w != NULL && _rideConstructionState != RIDE_CONSTRUCTION_STATE_0 && rideIndex == _currentRideIndex) {
sub_6C9627();
ride_construction_invalidate_current_track();
}
// Check back of the track
@@ -7196,7 +7196,7 @@ bool ride_select_backwards_from_front()
{
track_begin_end trackBeginEnd;
sub_6C9627();
ride_construction_invalidate_current_track();
if (track_block_get_previous_from_zero(_currentTrackBeginX, _currentTrackBeginY, _currentTrackBeginZ, _currentRideIndex, _currentTrackPieceDirection, &trackBeginEnd)) {
_rideConstructionState = RIDE_CONSTRUCTION_STATE_SELECTED;
_currentTrackBeginX = trackBeginEnd.begin_x;
@@ -7216,7 +7216,7 @@ bool ride_select_forwards_from_back()
{
sint32 x, y, z, direction;
sub_6C9627();
ride_construction_invalidate_current_track();
x = _currentTrackBeginX;
y = _currentTrackBeginY;
@@ -7488,7 +7488,7 @@ foundTrack:
w = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (w != NULL && _rideConstructionState != RIDE_CONSTRUCTION_STATE_0 && _currentRideIndex == rideIndex) {
sub_6C9627();
ride_construction_invalidate_current_track();
}
result = 0;

2
src/openrct2/ride/ride.h
View File

@@ -1037,7 +1037,7 @@ rct_ride_measurement *ride_get_measurement(sint32 rideIndex, rct_string_id *mess
void ride_breakdown_add_news_item(sint32 rideIndex);
rct_peep *ride_find_closest_mechanic(rct_ride *ride, sint32 forInspection);
sint32 sub_6CC3FB(sint32 rideIndex);
void sub_6C9627();
void ride_construction_invalidate_current_track();
sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type, uint16 extra_params, rct_map_element** output_element, uint16 flags);
void ride_set_map_tooltip(rct_map_element *mapElement);
sint32 ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint16 sampleRate, uint32 position, uint8 *tuneId);

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

@@ -166,7 +166,7 @@ rct_window *window_maze_construction_open()
*/
static void window_maze_construction_close(rct_window *w)
{
sub_6C9627();
ride_construction_invalidate_current_track();
viewport_set_visibility(0);
map_invalidate_map_selection_tiles();
@@ -199,7 +199,7 @@ static void window_maze_construction_entrance_mouseup(rct_window *w, rct_widgeti
gRideEntranceExitPlaceStationIndex = 0;
input_set_flag(INPUT_FLAG_6, true);
sub_6C9627();
ride_construction_invalidate_current_track();
// ???
uint8 old_state = _rideConstructionState;
@@ -352,7 +352,7 @@ static void window_maze_construction_toolupdate(rct_window* w, rct_widgetindex w
* rct2: 0x006C825F
*/
static void window_maze_construction_entrance_tooldown(sint32 x, sint32 y, rct_window* w){
sub_6C9627();
ride_construction_invalidate_current_track();
map_invalidate_selection_rect();
@@ -484,7 +484,7 @@ static void window_maze_construction_construct(sint32 direction)
{
sint32 x, y, z, flags, mode;
sub_6C9627();
ride_construction_invalidate_current_track();
x = _currentTrackBeginX + (TileDirectionDelta[direction].x / 2);
y = _currentTrackBeginY + (TileDirectionDelta[direction].y / 2);

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

@@ -642,7 +642,7 @@ rct_window *window_ride_construction_open()
*/
static void window_ride_construction_close(rct_window *w)
{
sub_6C9627();
ride_construction_invalidate_current_track();
viewport_set_visibility(0);
map_invalidate_map_selection_tiles();
@@ -1309,55 +1309,55 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
window_ride_construction_update_enabled_track_pieces();
switch (widgetIndex) {
case WIDX_LEFT_CURVE:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackCurve = TRACK_CURVE_LEFT;
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
break;
case WIDX_RIGHT_CURVE:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackCurve = TRACK_CURVE_RIGHT;
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
break;
case WIDX_LEFT_CURVE_SMALL:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackCurve = TRACK_CURVE_LEFT_SMALL;
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
break;
case WIDX_RIGHT_CURVE_SMALL:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackCurve = TRACK_CURVE_RIGHT_SMALL;
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
break;
case WIDX_LEFT_CURVE_VERY_SMALL:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackCurve = TRACK_CURVE_LEFT_VERY_SMALL;
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
break;
case WIDX_RIGHT_CURVE_VERY_SMALL:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackCurve = TRACK_CURVE_RIGHT_VERY_SMALL;
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
break;
case WIDX_LEFT_CURVE_LARGE:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackCurve = TRACK_CURVE_LEFT_LARGE;
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
break;
case WIDX_RIGHT_CURVE_LARGE:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackCurve = TRACK_CURVE_RIGHT_LARGE;
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
break;
case WIDX_STRAIGHT:
sub_6C9627();
ride_construction_invalidate_current_track();
if (_currentTrackCurve != TRACK_CURVE_NONE)
_currentTrackBankEnd = TRACK_BANK_NONE;
_currentTrackCurve = TRACK_CURVE_NONE;
@@ -1365,7 +1365,7 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
window_ride_construction_update_active_elements();
break;
case WIDX_SLOPE_DOWN_STEEP:
sub_6C9627();
ride_construction_invalidate_current_track();
if (is_track_enabled(TRACK_HELIX_SMALL)) {
if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT) {
_currentTrackCurve = TRACK_ELEM_LEFT_HALF_BANKED_HELIX_DOWN_LARGE | 0x100;
@@ -1424,14 +1424,14 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
}
break;
case WIDX_SLOPE_DOWN:
sub_6C9627();
ride_construction_invalidate_current_track();
if (_rideConstructionState == 2 && _currentTrackBankEnd != TRACK_BANK_NONE) {
_currentTrackBankEnd = TRACK_BANK_NONE;
}
loc_6C7502(6);
break;
case WIDX_LEVEL:
sub_6C9627();
ride_construction_invalidate_current_track();
if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_FRONT && _previousTrackSlopeEnd == 6) {
if (_currentTrackCurve == TRACK_CURVE_LEFT_SMALL) {
_currentTrackBankEnd = TRACK_BANK_LEFT;
@@ -1448,7 +1448,7 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
loc_6C7502(0);
break;
case WIDX_SLOPE_UP:
sub_6C9627();
ride_construction_invalidate_current_track();
if (_rideConstructionState == 1 && _currentTrackBankEnd != TRACK_BANK_NONE) {
_currentTrackBankEnd = TRACK_BANK_NONE;
}
@@ -1462,7 +1462,7 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
}
break;
case WIDX_SLOPE_UP_STEEP:
sub_6C9627();
ride_construction_invalidate_current_track();
if (is_track_enabled(TRACK_HELIX_SMALL)) {
if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT) {
_currentTrackCurve = TRACK_ELEM_LEFT_HALF_BANKED_HELIX_UP_LARGE | 0x100;
@@ -1521,7 +1521,7 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
}
break;
case WIDX_CHAIN_LIFT:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackLiftHill ^= 1;
if (_currentTrackLiftHill & 1) {
_currentTrackAlternative &= ~RIDE_TYPE_ALTERNATIVE_TRACK_PIECES;
@@ -1530,7 +1530,7 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
window_ride_construction_update_active_elements();
break;
case WIDX_BANK_LEFT:
sub_6C9627();
ride_construction_invalidate_current_track();
if (_currentlyShowingBrakeSpeed == 0) {
_currentTrackBankEnd = TRACK_BANK_LEFT;
_currentTrackPrice = MONEY32_UNDEFINED;
@@ -1538,7 +1538,7 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
}
break;
case WIDX_BANK_STRAIGHT:
sub_6C9627();
ride_construction_invalidate_current_track();
if (_currentlyShowingBrakeSpeed == 0) {
_currentTrackBankEnd = TRACK_BANK_NONE;
_currentTrackPrice = MONEY32_UNDEFINED;
@@ -1562,7 +1562,7 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
}
break;
case WIDX_BANK_RIGHT:
sub_6C9627();
ride_construction_invalidate_current_track();
if (_currentlyShowingBrakeSpeed == 0) {
_currentTrackBankEnd = TRACK_BANK_RIGHT;
_currentTrackPrice = MONEY32_UNDEFINED;
@@ -1587,13 +1587,13 @@ static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_
window_ride_construction_show_special_track_dropdown(w, widget);
break;
case WIDX_U_TRACK:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackAlternative &= ~RIDE_TYPE_ALTERNATIVE_TRACK_PIECES;
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
break;
case WIDX_O_TRACK:
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackAlternative |= RIDE_TYPE_ALTERNATIVE_TRACK_PIECES;
_currentTrackLiftHill &= ~1;
_currentTrackPrice = MONEY32_UNDEFINED;
@@ -1633,7 +1633,7 @@ static void window_ride_construction_dropdown(rct_window *w, rct_widgetindex wid
if (dropdownIndex == -1)
return;
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackPrice = MONEY32_UNDEFINED;
sint32 trackPiece = _currentPossibleRideConfigurations[dropdownIndex];
switch (trackPiece) {
@@ -1663,7 +1663,7 @@ static void window_ride_construction_construct(rct_window *w)
_currentTrackPrice = MONEY32_UNDEFINED;
_trackPlaceCost = MONEY32_UNDEFINED;
sub_6C9627();
ride_construction_invalidate_current_track();
if (sub_6CA2DF(&trackType, &trackDirection, &rideIndex, &edxRS16, &x, &y, &z, &properties)) {
window_ride_construction_update_active_elements();
return;
@@ -1783,7 +1783,7 @@ static void window_ride_construction_mouseup_demolish(rct_window* w)
//bool gotoStartPlacementMode;
_currentTrackPrice = MONEY32_UNDEFINED;
sub_6C9627();
ride_construction_invalidate_current_track();
// Select the track element that is to be deleted
_rideConstructionState2 = RIDE_CONSTRUCTION_STATE_SELECTED;
@@ -1948,7 +1948,7 @@ void window_ride_construction_mouseup_demolish_next_piece(sint32 x, sint32 y, si
static void window_ride_construction_rotate(rct_window *w)
{
_currentTrackPieceDirection = (_currentTrackPieceDirection + 1) & 3;
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackPrice = MONEY32_UNDEFINED;
window_ride_construction_update_active_elements();
}
@@ -1968,7 +1968,7 @@ static void window_ride_construction_entrance_click(rct_window *w)
gRideEntranceExitPlaceRideIndex = w->number & 0xFF;
gRideEntranceExitPlaceStationIndex = 0;
input_set_flag(INPUT_FLAG_6, true);
sub_6C9627();
ride_construction_invalidate_current_track();
if (_rideConstructionState != RIDE_CONSTRUCTION_STATE_ENTRANCE_EXIT) {
gRideEntranceExitPlacePreviousRideConstructionState = _rideConstructionState;
_rideConstructionState = RIDE_CONSTRUCTION_STATE_ENTRANCE_EXIT;
@@ -1992,7 +1992,7 @@ static void window_ride_construction_exit_click(rct_window *w)
gRideEntranceExitPlaceRideIndex = w->number & 0xFF;
gRideEntranceExitPlaceStationIndex = 0;
input_set_flag(INPUT_FLAG_6, true);
sub_6C9627();
ride_construction_invalidate_current_track();
if (_rideConstructionState != RIDE_CONSTRUCTION_STATE_ENTRANCE_EXIT) {
gRideEntranceExitPlacePreviousRideConstructionState = _rideConstructionState;
_rideConstructionState = RIDE_CONSTRUCTION_STATE_ENTRANCE_EXIT;
@@ -2807,7 +2807,7 @@ void sub_6C94D8()
// Recheck if area is fine for new track.
// Set by footpath placement
if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_RECHECK) {
sub_6C9627();
ride_construction_invalidate_current_track();
_currentTrackSelectionFlags &= ~TRACK_SELECTION_FLAG_RECHECK;
}
@@ -3647,7 +3647,7 @@ void ride_construction_toolupdate_construct(sint32 screenX, sint32 screenY)
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW;
if (!ride_get_place_position_from_screen_position(screenX, screenY, &x, &y)) {
sub_6C9627();
ride_construction_invalidate_current_track();
map_invalidate_map_selection_tiles();
return;
}
@@ -3670,7 +3670,7 @@ void ride_construction_toolupdate_construct(sint32 screenX, sint32 screenY)
sint32 trackType, trackDirection, rideIndex, edxRS16;
if (sub_6CA2DF(&trackType, &trackDirection, &rideIndex, &edxRS16, NULL, NULL, NULL, NULL)) {
sub_6C9627();
ride_construction_invalidate_current_track();
map_invalidate_map_selection_tiles();
return;
}
@@ -3789,7 +3789,7 @@ void ride_construction_toolupdate_entrance_exit(sint32 screenX, sint32 screenY)
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW;
ride_get_entrance_or_exit_position_from_screen_position(screenX, screenY, &x, &y, &direction);
if (gRideEntranceExitPlaceDirection == 255) {
sub_6C9627();
ride_construction_invalidate_current_track();
return;
}
gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE;
@@ -3832,7 +3832,7 @@ void ride_construction_tooldown_construct(sint32 screenX, sint32 screenY)
rct_window *w;
map_invalidate_map_selection_tiles();
sub_6C9627();
ride_construction_invalidate_current_track();
if (sub_6CA2DF(&trackType, &trackDirection, &rideIndex, &edxRS16, &x, &y, &z, &properties))
return;
@@ -4028,7 +4028,7 @@ void ride_construction_tooldown_construct(sint32 screenX, sint32 screenY)
*/
static void ride_construction_tooldown_entrance_exit(sint32 screenX, sint32 screenY)
{
sub_6C9627();
ride_construction_invalidate_current_track();
map_invalidate_selection_rect();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW;