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

Name sub_6CC3FB()

This commit is contained in:
Richard Jenkins 2017-06-02 00:19:59 +01:00 committed by rwjuk
parent 5c28e66aa2
commit 1d2ced2ad7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1021,7 +1021,7 @@ void ride_construct(sint32 rideIndex)
if (w != NULL && ride_modify(&trackElement)) if (w != NULL && ride_modify(&trackElement))
window_scroll_to_location(w, trackElement.x, trackElement.y, trackElement.element->base_height * 8); window_scroll_to_location(w, trackElement.x, trackElement.y, trackElement.element->base_height * 8);
} else { } else {
sub_6CC3FB(rideIndex); ride_initialise_construction_window(rideIndex);
} }
} }
@ -1727,7 +1727,7 @@ static sint32 ride_modify_entrance_or_exit(rct_map_element *mapElement, sint32 x
// Get or create construction window for ride // Get or create construction window for ride
constructionWindow = window_find_by_class(WC_RIDE_CONSTRUCTION); constructionWindow = window_find_by_class(WC_RIDE_CONSTRUCTION);
if (constructionWindow == NULL) { if (constructionWindow == NULL) {
if (!sub_6CC3FB(rideIndex)) if (!ride_initialise_construction_window(rideIndex))
return 0; return 0;
constructionWindow = window_find_by_class(WC_RIDE_CONSTRUCTION); constructionWindow = window_find_by_class(WC_RIDE_CONSTRUCTION);
@ -1888,7 +1888,7 @@ sint32 ride_modify(rct_xy_element *input)
* *
* rct2: 0x006CC3FB * rct2: 0x006CC3FB
*/ */
sint32 sub_6CC3FB(sint32 rideIndex) sint32 ride_initialise_construction_window(sint32 rideIndex)
{ {
rct_ride *ride; rct_ride *ride;
rct_window *w; rct_window *w;

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

@ -1036,7 +1036,7 @@ void ride_measurements_update();
rct_ride_measurement *ride_get_measurement(sint32 rideIndex, rct_string_id *message); rct_ride_measurement *ride_get_measurement(sint32 rideIndex, rct_string_id *message);
void ride_breakdown_add_news_item(sint32 rideIndex); void ride_breakdown_add_news_item(sint32 rideIndex);
rct_peep *ride_find_closest_mechanic(rct_ride *ride, sint32 forInspection); rct_peep *ride_find_closest_mechanic(rct_ride *ride, sint32 forInspection);
sint32 sub_6CC3FB(sint32 rideIndex); sint32 ride_initialise_construction_window(sint32 rideIndex);
void ride_construction_invalidate_current_track(); 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); 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); void ride_set_map_tooltip(rct_map_element *mapElement);

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

@ -1892,7 +1892,7 @@ void window_ride_construction_mouseup_demolish_next_piece(sint32 x, sint32 y, si
ride_construction_set_default_next_piece(); ride_construction_set_default_next_piece();
window_ride_construction_update_active_elements(); window_ride_construction_update_active_elements();
if (!ride_try_get_origin_element(_currentRideIndex, NULL)) { if (!ride_try_get_origin_element(_currentRideIndex, NULL)) {
sub_6CC3FB(_currentRideIndex); ride_initialise_construction_window(_currentRideIndex);
_currentTrackPieceDirection = direction; _currentTrackPieceDirection = direction;
if (!(slope & 0x100)) { if (!(slope & 0x100)) {
_currentTrackCurve = slope; _currentTrackCurve = slope;
@ -1961,7 +1961,7 @@ static void window_ride_construction_entrance_click(rct_window *w)
{ {
if (tool_set(w, WIDX_ENTRANCE, TOOL_CROSSHAIR)) { if (tool_set(w, WIDX_ENTRANCE, TOOL_CROSSHAIR)) {
if (!ride_try_get_origin_element(_currentRideIndex, NULL)) { if (!ride_try_get_origin_element(_currentRideIndex, NULL)) {
sub_6CC3FB(_currentRideIndex); ride_initialise_construction_window(_currentRideIndex);
} }
} else { } else {
gRideEntranceExitPlaceType = ENTRANCE_TYPE_RIDE_ENTRANCE; gRideEntranceExitPlaceType = ENTRANCE_TYPE_RIDE_ENTRANCE;
@ -1985,7 +1985,7 @@ static void window_ride_construction_exit_click(rct_window *w)
{ {
if (tool_set(w, WIDX_EXIT, TOOL_CROSSHAIR)) { if (tool_set(w, WIDX_EXIT, TOOL_CROSSHAIR)) {
if (!ride_try_get_origin_element(_currentRideIndex, NULL)) { if (!ride_try_get_origin_element(_currentRideIndex, NULL)) {
sub_6CC3FB(_currentRideIndex); ride_initialise_construction_window(_currentRideIndex);
} }
} else { } else {
gRideEntranceExitPlaceType = ENTRANCE_TYPE_RIDE_EXIT; gRideEntranceExitPlaceType = ENTRANCE_TYPE_RIDE_EXIT;
@ -3986,7 +3986,7 @@ void ride_construction_tooldown_construct(sint32 screenX, sint32 screenY)
sint32 saveCurrentTrackAlternative = _currentTrackAlternative; sint32 saveCurrentTrackAlternative = _currentTrackAlternative;
sint32 saveCurrentTrackLiftHill = _currentTrackLiftHill; sint32 saveCurrentTrackLiftHill = _currentTrackLiftHill;
sub_6CC3FB(_currentRideIndex); ride_initialise_construction_window(_currentRideIndex);
_currentTrackPieceDirection = saveTrackDirection; _currentTrackPieceDirection = saveTrackDirection;
_currentTrackCurve = saveCurrentTrackCurve; _currentTrackCurve = saveCurrentTrackCurve;

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

@ -336,7 +336,7 @@ static void window_track_place_tooldown(rct_window* w, rct_widgetindex widgetInd
window_ride_main_open(rideIndex); window_ride_main_open(rideIndex);
window_close(w); window_close(w);
} else { } else {
sub_6CC3FB(rideIndex); ride_initialise_construction_window(rideIndex);
w = window_find_by_class(WC_RIDE_CONSTRUCTION); w = window_find_by_class(WC_RIDE_CONSTRUCTION);
window_event_mouse_up_call(w, WC_RIDE_CONSTRUCTION__WIDX_ENTRANCE); window_event_mouse_up_call(w, WC_RIDE_CONSTRUCTION__WIDX_ENTRANCE);
} }