From 5c28e66aa2a5e4fcbac7535833b44f7ffbd4ff1d Mon Sep 17 00:00:00 2001 From: Richard Jenkins Date: Fri, 2 Jun 2017 00:09:49 +0100 Subject: [PATCH] Name sub_6D01B3() --- src/openrct2/ride/track_design.c | 12 ++++++------ src/openrct2/ride/track_design.h | 2 +- src/openrct2/ride/track_design_save.c | 4 ++-- src/openrct2/windows/track_place.c | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/openrct2/ride/track_design.c b/src/openrct2/ride/track_design.c index 18187435d6..49cde38aa6 100644 --- a/src/openrct2/ride/track_design.c +++ b/src/openrct2/ride/track_design.c @@ -1268,7 +1268,7 @@ static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint * bl == 6, Clear white outlined track. * rct2: 0x006D01B3 */ -sint32 sub_6D01B3(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, sint32 x, sint32 y, sint32 z) +sint32 place_virtual_track(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, sint32 x, sint32 y, sint32 z) { byte_F4414E = (bl & PTD_OPERATION_DONT_PLACE_SCENERY) ? BYTE_F4414E_DONT_PLACE_SCENERY : 0; _trackDesignPlaceOperation = bl & 0x7F; @@ -1361,7 +1361,7 @@ static bool sub_6D2189(rct_track_td6 *td6, money32 *cost, uint8 *rideId, uint8 * sint32 mapSize = gMapSize << 4; _currentTrackPieceDirection = 0; - sint32 z = sub_6D01B3(td6, PTD_OPERATION_GET_PLACE_Z, 0, mapSize, mapSize, 16); + sint32 z = place_virtual_track(td6, PTD_OPERATION_GET_PLACE_Z, 0, mapSize, mapSize, 16); if (byte_F4414E & BYTE_F4414E_HAS_SCENERY) { *flags |= TRACK_DESIGN_FLAG_HAS_SCENERY; @@ -1375,7 +1375,7 @@ static bool sub_6D2189(rct_track_td6 *td6, money32 *cost, uint8 *rideId, uint8 * *flags |= TRACK_DESIGN_FLAG_SCENERY_UNAVAILABLE; } - money32 resultCost = sub_6D01B3(td6, operation, rideIndex, mapSize, mapSize, z); + money32 resultCost = place_virtual_track(td6, operation, rideIndex, mapSize, mapSize, z); gParkFlags = backup_park_flags; if (resultCost != MONEY32_UNDEFINED) { @@ -1441,10 +1441,10 @@ static money32 place_track_design(sint16 x, sint16 y, sint16 z, uint8 flags, uin money32 cost = 0; if (!(flags & GAME_COMMAND_FLAG_APPLY)) { _trackDesignDontPlaceScenery = false; - cost = sub_6D01B3(td6, PTD_OPERATION_1, rideIndex, x, y, z); + cost = place_virtual_track(td6, PTD_OPERATION_1, rideIndex, x, y, z); if (byte_F4414E & BYTE_F4414E_SCENERY_UNAVAILABLE) { _trackDesignDontPlaceScenery = true; - cost = sub_6D01B3(td6, PTD_OPERATION_DONT_PLACE_SCENERY | PTD_OPERATION_1, rideIndex, x, y, z); + cost = place_virtual_track(td6, PTD_OPERATION_DONT_PLACE_SCENERY | PTD_OPERATION_1, rideIndex, x, y, z); } } else { uint8 operation; @@ -1456,7 +1456,7 @@ static money32 place_track_design(sint16 x, sint16 y, sint16 z, uint8 flags, uin if (_trackDesignDontPlaceScenery) operation |= PTD_OPERATION_DONT_PLACE_SCENERY; - cost = sub_6D01B3(td6, operation, rideIndex, x, y, z); + cost = place_virtual_track(td6, operation, rideIndex, x, y, z); } if (cost == MONEY32_UNDEFINED || !(flags & GAME_COMMAND_FLAG_APPLY)) { diff --git a/src/openrct2/ride/track_design.h b/src/openrct2/ride/track_design.h index 67862c7ac1..a9cb3cb73a 100644 --- a/src/openrct2/ride/track_design.h +++ b/src/openrct2/ride/track_design.h @@ -215,7 +215,7 @@ void track_design_dispose(rct_track_td6 *td6); void track_design_mirror(rct_track_td6 *td6); -sint32 sub_6D01B3(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, sint32 x, sint32 y, sint32 z); +sint32 place_virtual_track(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, sint32 x, sint32 y, sint32 z); void game_command_place_track_design(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); void game_command_place_maze_design(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index 47a5a18654..d5afe05c3a 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -927,7 +927,7 @@ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td // Save global vars as they are still used by scenery sint16 startZ = gTrackPreviewOrigin.z; - sub_6D01B3(td6, PTD_OPERATION_DRAW_OUTLINES, 0, 4096, 4096, 0); + place_virtual_track(td6, PTD_OPERATION_DRAW_OUTLINES, 0, 4096, 4096, 0); gTrackPreviewOrigin = (rct_xyz16) { startX, startY, startZ }; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT; @@ -1107,7 +1107,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track td6->entrance_elements = realloc(td6->entrance_elements, numEntranceElements * sizeof(rct_td6_entrance_element) + 1); *((uint8*)&td6->entrance_elements[numEntranceElements]) = 0xFF; - sub_6D01B3(td6, PTD_OPERATION_DRAW_OUTLINES, 0, 4096, 4096, 0); + place_virtual_track(td6, PTD_OPERATION_DRAW_OUTLINES, 0, 4096, 4096, 0); // Resave global vars for scenery reasons. gTrackPreviewOrigin = (rct_xyz16) { start_x, start_y, start_z }; diff --git a/src/openrct2/windows/track_place.c b/src/openrct2/windows/track_place.c index 3a5a625261..2543212f3f 100644 --- a/src/openrct2/windows/track_place.c +++ b/src/openrct2/windows/track_place.c @@ -262,7 +262,7 @@ static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetI // Check if tool map position has changed since last update if (mapX == _window_track_place_last_x && mapY == _window_track_place_last_y) { - sub_6D01B3(_trackDesign, PTD_OPERATION_DRAW_OUTLINES, 0, mapX, mapY, 0); + place_virtual_track(_trackDesign, PTD_OPERATION_DRAW_OUTLINES, 0, mapX, mapY, 0); return; } @@ -296,7 +296,7 @@ static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetI widget_invalidate(w, WIDX_PRICE); } - sub_6D01B3(_trackDesign, PTD_OPERATION_DRAW_OUTLINES, 0, mapX, mapY, mapZ); + place_virtual_track(_trackDesign, PTD_OPERATION_DRAW_OUTLINES, 0, mapX, mapY, mapZ); } /** @@ -384,7 +384,7 @@ static void window_track_place_invalidate(rct_window *w) static void window_track_place_clear_provisional() { if (_window_track_place_last_was_valid) { - sub_6D01B3( + place_virtual_track( _trackDesign, PTD_OPERATION_CLEAR_OUTLINES, _window_track_place_ride_index, @@ -421,7 +421,7 @@ static sint32 window_track_place_get_base_z(sint32 x, sint32 y) if (mapElement->properties.surface.terrain & 0x1F) z = max(z, (mapElement->properties.surface.terrain & 0x1F) << 4); - return z + sub_6D01B3(_trackDesign, PTD_OPERATION_GET_PLACE_Z, 0, x, y, z); + return z + place_virtual_track(_trackDesign, PTD_OPERATION_GET_PLACE_Z, 0, x, y, z); } static void window_track_place_attempt_placement(rct_track_td6 *td6, sint32 x, sint32 y, sint32 z, sint32 bl, money32 *cost, uint8 *rideIndex)