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

Close #12242: Convert TrackDesignPlace static globals to use Coords (#12249)

Browse Source
This commit is contained in:
frutiemax
2020-07-14 22:01:16 -04:00
committed by GitHub
parent cc96f5509a
commit f94c3bc2f3
1 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/openrct2-ui/windows/TrackDesignPlace.cpp
View File

@@ -111,14 +111,11 @@ static rct_window_event_list window_track_place_events = {
// clang-format on
static std::vector<uint8_t> _window_track_place_mini_preview;
static int16_t _window_track_place_last_x;
static int16_t _window_track_place_last_y;
static CoordsXY _windowTrackPlaceLast;
static uint8_t _window_track_place_ride_index;
static bool _window_track_place_last_was_valid;
static int16_t _window_track_place_last_valid_x;
static int16_t _window_track_place_last_valid_y;
static int16_t _window_track_place_last_valid_z;
static CoordsXYZ _windowTrackPlaceLastValid;
static money32 _window_track_place_last_cost;
static std::unique_ptr<TrackDesign> _trackDesign;
@@ -171,7 +168,7 @@ rct_window* window_track_place_open(const track_design_file_ref* tdFileRef)
window_push_others_right(w);
show_gridlines();
_window_track_place_last_cost = MONEY32_UNDEFINED;
_window_track_place_last_x = -1;
_windowTrackPlaceLast.setNull();
_currentTrackPieceDirection = (2 - get_current_rotation()) & 3;
window_track_place_clear_mini_preview();
@@ -212,14 +209,14 @@ static void window_track_place_mouseup(rct_window* w, rct_widgetindex widgetInde
window_track_place_clear_provisional();
_currentTrackPieceDirection = (_currentTrackPieceDirection + 1) & 3;
w->Invalidate();
_window_track_place_last_x = -1;
_windowTrackPlaceLast.setNull();
window_track_place_draw_mini_preview(_trackDesign.get());
break;
case WIDX_MIRROR:
track_design_mirror(_trackDesign.get());
_currentTrackPieceDirection = (0 - _currentTrackPieceDirection) & 3;
w->Invalidate();
_window_track_place_last_x = -1;
_windowTrackPlaceLast.setNull();
window_track_place_draw_mini_preview(_trackDesign.get());
break;
case WIDX_SELECT_DIFFERENT_DESIGN:
@@ -285,7 +282,7 @@ static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetI
}
// Check if tool map position has changed since last update
if (mapCoords.x == _window_track_place_last_x && mapCoords.y == _window_track_place_last_y)
if (mapCoords == _windowTrackPlaceLast)
{
place_virtual_track(_trackDesign.get(), PTD_OPERATION_DRAW_OUTLINES, true, GetOrAllocateRide(0), { mapCoords, 0 });
return;
@@ -311,9 +308,7 @@ static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetI
if (result->Error == GA_ERROR::OK)
{
_window_track_place_ride_index = result->rideIndex;
_window_track_place_last_valid_x = trackLoc.x;
_window_track_place_last_valid_y = trackLoc.y;
_window_track_place_last_valid_z = trackLoc.z;
_windowTrackPlaceLastValid = trackLoc;
_window_track_place_last_was_valid = true;
}
});
@@ -322,8 +317,7 @@ static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetI
}
}
_window_track_place_last_x = trackLoc.x;
_window_track_place_last_y = trackLoc.y;
_windowTrackPlaceLast = trackLoc;
if (cost != _window_track_place_last_cost)
{
_window_track_place_last_cost = cost;
@@ -433,9 +427,7 @@ static void window_track_place_clear_provisional()
auto ride = get_ride(_window_track_place_ride_index);
if (ride != nullptr)
{
place_virtual_track(
_trackDesign.get(), PTD_OPERATION_REMOVE_GHOST, true, ride,
{ _window_track_place_last_valid_x, _window_track_place_last_valid_y, _window_track_place_last_valid_z });
place_virtual_track(_trackDesign.get(), PTD_OPERATION_REMOVE_GHOST, true, ride, _windowTrackPlaceLastValid);
_window_track_place_last_was_valid = false;
}
}
@@ -448,9 +440,7 @@ void TrackPlaceClearProvisionalTemporarily()
auto ride = get_ride(_window_track_place_ride_index);
if (ride != nullptr)
{
place_virtual_track(
_trackDesign.get(), PTD_OPERATION_REMOVE_GHOST, true, ride,
{ _window_track_place_last_valid_x, _window_track_place_last_valid_y, _window_track_place_last_valid_z });
place_virtual_track(_trackDesign.get(), PTD_OPERATION_REMOVE_GHOST, true, ride, _windowTrackPlaceLastValid);
}
}
}
@@ -459,10 +449,7 @@ void TrackPlaceRestoreProvisional()
{
if (_window_track_place_last_was_valid)
{
auto tdAction = TrackDesignAction(
{ _window_track_place_last_valid_x, _window_track_place_last_valid_y, _window_track_place_last_valid_z,
_currentTrackPieceDirection },
*_trackDesign);
auto tdAction = TrackDesignAction({ _windowTrackPlaceLastValid, _currentTrackPieceDirection }, *_trackDesign);
tdAction.SetFlags(GAME_COMMAND_FLAG_NO_SPEND | GAME_COMMAND_FLAG_GHOST);
auto res = GameActions::Execute(&tdAction);
if (res->Error != GA_ERROR::OK)