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

Use ScreenCoordsXY for MazeConstruction (#10222)

Browse Source
This commit is contained in:
Tulio Leao
2019-11-13 02:54:55 -08:00
committed by Michael Steenbeek
parent 9df66b1f1f
commit 0fc6da2443
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@@ -353,7 +353,7 @@ static void window_maze_construction_toolupdate(rct_window* w, rct_widgetindex w
*
* rct2: 0x006C825F
*/
static void window_maze_construction_entrance_tooldown(int32_t x, int32_t y, rct_window* w)
static void window_maze_construction_entrance_tooldown(ScreenCoordsXY screenCoords, rct_window* w)
{
ride_construction_invalidate_current_track();
@@ -363,7 +363,11 @@ static void window_maze_construction_entrance_tooldown(int32_t x, int32_t y, rct
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW;
int32_t direction = 0;
ride_get_entrance_or_exit_position_from_screen_position(x, y, &x, &y, &direction);
CoordsXY entranceOrExitCoords;
ride_get_entrance_or_exit_position_from_screen_position(
screenCoords.x, screenCoords.y, &entranceOrExitCoords.x, &entranceOrExitCoords.y, &direction);
if (entranceOrExitCoords.x == LOCATION_NULL)
return;
if (gRideEntranceExitPlaceDirection == 0xFF)
return;
@@ -371,7 +375,7 @@ static void window_maze_construction_entrance_tooldown(int32_t x, int32_t y, rct
ride_id_t rideIndex = gRideEntranceExitPlaceRideIndex;
auto rideEntranceExitPlaceAction = RideEntranceExitPlaceAction(
{ x, y }, direction_reverse(direction), rideIndex, gRideEntranceExitPlaceStationIndex,
entranceOrExitCoords, direction_reverse(direction), rideIndex, gRideEntranceExitPlaceStationIndex,
gRideEntranceExitPlaceType == ENTRANCE_TYPE_RIDE_EXIT);
rideEntranceExitPlaceAction.SetCallback([=](const GameAction* ga, const GameActionResult* result) {
@@ -410,7 +414,7 @@ static void window_maze_construction_tooldown(rct_window* w, rct_widgetindex wid
break;
case WIDX_MAZE_ENTRANCE:
case WIDX_MAZE_EXIT:
window_maze_construction_entrance_tooldown(screenCoords.x, screenCoords.y, w);
window_maze_construction_entrance_tooldown(screenCoords, w);
break;
}
}