From b4f39231624572f5dc836fbc3a915526d77d83a2 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sun, 8 Aug 2021 18:10:52 +0200 Subject: [PATCH] Name byte_9D8150 --- src/openrct2/actions/SmallSceneryPlaceAction.cpp | 2 +- src/openrct2/actions/TrackPlaceAction.cpp | 4 ++-- src/openrct2/actions/WallPlaceAction.cpp | 2 +- src/openrct2/ride/TrackDesign.cpp | 8 ++++---- src/openrct2/ride/TrackDesign.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp index 5aaeabc114..d78fc3fea1 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp @@ -121,7 +121,7 @@ GameActions::Result::Ptr SmallSceneryPlaceAction::Query() const return std::make_unique(GameActions::Status::NoFreeElements); } - if (!byte_9D8150 && (_loc.x > gMapSizeMaxXY || _loc.y > gMapSizeMaxXY)) + if (!_trackDesignDrawingPreview && (_loc.x > gMapSizeMaxXY || _loc.y > gMapSizeMaxXY)) { return std::make_unique(GameActions::Status::InvalidParameters); } diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 4858dff29e..ec4ce6cb29 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -284,7 +284,7 @@ GameActions::Result::Ptr TrackPlaceAction::Query() const GameActions::Status::Disallowed, STR_RIDE_CANT_BUILD_THIS_UNDERWATER); } - if ((rideTypeFlags & RIDE_TYPE_FLAG_TRACK_MUST_BE_ON_WATER) && !byte_9D8150) + if ((rideTypeFlags & RIDE_TYPE_FLAG_TRACK_MUST_BE_ON_WATER) && !_trackDesignDrawingPreview) { auto surfaceElement = map_get_surface_element_at(mapLoc); if (surfaceElement == nullptr) @@ -347,7 +347,7 @@ GameActions::Result::Ptr TrackPlaceAction::Query() const } ride_height /= COORDS_Z_PER_TINY_Z; - if (ride_height > maxHeight && !byte_9D8150) + if (ride_height > maxHeight && !_trackDesignDrawingPreview) { return std::make_unique(GameActions::Status::Disallowed, STR_TOO_HIGH_FOR_SUPPORTS); } diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index a02479b4ed..e250a017b4 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -109,7 +109,7 @@ GameActions::Result::Ptr WallPlaceAction::Query() const return std::make_unique(GameActions::Status::NotOwned); } } - else if (!byte_9D8150 && (_loc.x > gMapSizeMaxXY || _loc.y > gMapSizeMaxXY)) + else if (!_trackDesignDrawingPreview && (_loc.x > gMapSizeMaxXY || _loc.y > gMapSizeMaxXY)) { log_error("Invalid x/y coordinates. x = %d y = %d", _loc.x, _loc.y); return std::make_unique(GameActions::Status::InvalidParameters); diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 8152a9eb48..f44b72501e 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -83,7 +83,7 @@ static CoordsXYZ _trackPreviewMin; static CoordsXYZ _trackPreviewMax; static CoordsXYZ _trackPreviewOrigin; -bool byte_9D8150; +bool _trackDesignDrawingPreview; static uint8_t _trackDesignPlaceOperation; static money32 _trackDesignPlaceCost; static int16_t _trackDesignPlaceZ; @@ -1919,7 +1919,7 @@ static bool track_design_place_preview(TrackDesign* td6, money32* cost, Ride** o } } - byte_9D8150 = true; + _trackDesignDrawingPreview = true; uint8_t backup_rotation = _currentTrackPieceDirection; uint32_t backup_park_flags = gParkFlags; gParkFlags &= ~PARK_FLAGS_FORBID_HIGH_CONSTRUCTION; @@ -1958,7 +1958,7 @@ static bool track_design_place_preview(TrackDesign* td6, money32* cost, Ride** o } _currentTrackPieceDirection = backup_rotation; - byte_9D8150 = false; + _trackDesignDrawingPreview = false; *cost = resultCost; *outRide = ride; return true; @@ -1967,7 +1967,7 @@ static bool track_design_place_preview(TrackDesign* td6, money32* cost, Ride** o { _currentTrackPieceDirection = backup_rotation; ride->Delete(); - byte_9D8150 = false; + _trackDesignDrawingPreview = false; return false; } } diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index a1161469c0..1f5c069c15 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -195,7 +195,7 @@ enum extern TrackDesign* gActiveTrackDesign; extern bool gTrackDesignSceneryToggle; -extern bool byte_9D8150; +extern bool _trackDesignDrawingPreview; extern bool _trackDesignPlaceStateSceneryUnavailable; extern bool gTrackDesignSaveMode;