From ba49850195ed4e057cbcb6357acbf134fd11406f Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 7 Mar 2020 23:20:21 +0100 Subject: [PATCH] Fix errors and apply requests --- src/openrct2/actions/BannerPlaceAction.hpp | 2 +- src/openrct2/actions/RideEntranceExitPlaceAction.hpp | 2 +- src/openrct2/actions/SmallSceneryPlaceAction.hpp | 3 +-- src/openrct2/actions/TrackPlaceAction.hpp | 2 +- src/openrct2/actions/WallPlaceAction.hpp | 1 - src/openrct2/ride/Track.cpp | 2 +- src/openrct2/world/MapGen.cpp | 2 +- src/openrct2/world/TileInspector.cpp | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/openrct2/actions/BannerPlaceAction.hpp b/src/openrct2/actions/BannerPlaceAction.hpp index d241d00e08..aedf694edd 100644 --- a/src/openrct2/actions/BannerPlaceAction.hpp +++ b/src/openrct2/actions/BannerPlaceAction.hpp @@ -121,7 +121,7 @@ public: log_error("No free map elements."); return MakeResult(GA_ERROR::NO_FREE_ELEMENTS, STR_CANT_POSITION_THIS_HERE); } - + if (_bannerIndex == BANNER_INDEX_NULL || _bannerIndex >= MAX_BANNERS) { log_error("Invalid banner index, bannerIndex = %u", _bannerIndex); diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.hpp b/src/openrct2/actions/RideEntranceExitPlaceAction.hpp index ba2bdf2a65..134f129fc3 100644 --- a/src/openrct2/actions/RideEntranceExitPlaceAction.hpp +++ b/src/openrct2/actions/RideEntranceExitPlaceAction.hpp @@ -182,7 +182,7 @@ public: res->Position = { _loc.ToTileCentre(), z }; res->Expenditure = ExpenditureType::RideConstruction; - TileElement* tileElement = tile_element_insert((CoordsXYZ{ _loc, z }), 0b1111); + TileElement* tileElement = tile_element_insert(CoordsXYZ{ _loc, z }, 0b1111); assert(tileElement != nullptr); tileElement->SetType(TILE_ELEMENT_TYPE_ENTRANCE); tileElement->SetDirection(_direction); diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.hpp b/src/openrct2/actions/SmallSceneryPlaceAction.hpp index 715e8ea7e7..1223b5dd6d 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.hpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.hpp @@ -428,8 +428,7 @@ public: res->Expenditure = ExpenditureType::Landscaping; res->Cost = (sceneryEntry->small_scenery.price * 10) + clearCost; - TileElement* newElement = tile_element_insert( - CoordsXYZ{ _loc, zLow }, quarterTile.GetBaseQuarterOccupied()); + TileElement* newElement = tile_element_insert(CoordsXYZ{ _loc, zLow }, quarterTile.GetBaseQuarterOccupied()); assert(newElement != nullptr); res->tileElement = newElement; newElement->SetType(TILE_ELEMENT_TYPE_SMALL_SCENERY); diff --git a/src/openrct2/actions/TrackPlaceAction.hpp b/src/openrct2/actions/TrackPlaceAction.hpp index 4f2e21fd6a..ca5245dd78 100644 --- a/src/openrct2/actions/TrackPlaceAction.hpp +++ b/src/openrct2/actions/TrackPlaceAction.hpp @@ -348,7 +348,7 @@ public: } if ((entranceDirections & TRACK_SEQUENCE_FLAG_ORIGIN) && trackBlock->index == 0) { - if (!track_add_station_element({ mapLoc, baseZ / COORDS_Z_STEP, _origin.direction }, _rideIndex, 0)) + if (!track_add_station_element({ mapLoc, baseZ, _origin.direction }, _rideIndex, 0)) { return std::make_unique(GA_ERROR::UNKNOWN, gGameCommandErrorText); } diff --git a/src/openrct2/actions/WallPlaceAction.hpp b/src/openrct2/actions/WallPlaceAction.hpp index d8fea1e7d1..c2d31e7d52 100644 --- a/src/openrct2/actions/WallPlaceAction.hpp +++ b/src/openrct2/actions/WallPlaceAction.hpp @@ -392,7 +392,6 @@ public: { return MakeResult(GA_ERROR::NO_FREE_ELEMENTS, STR_TILE_ELEMENT_LIMIT_REACHED); } - TileElement* tileElement = tile_element_insert(targetLoc, 0b0000); assert(tileElement != nullptr); diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index c3d41266b0..5b69389bc8 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -619,7 +619,7 @@ static TileElement* find_station_element(const CoordsXYZD& loc, ride_id_t rideIn return nullptr; } -static void ride_remove_station(Ride* ride, CoordsXYZ location) +static void ride_remove_station(Ride* ride, const CoordsXYZ& location) { for (int32_t i = 0; i < MAX_STATIONS; i++) { diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 3bde9bcde4..4c2eef6014 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -237,7 +237,7 @@ static void mapgen_place_tree(int32_t type, int32_t x, int32_t y) { return; } - + auto loc = CoordsXY(x, y); int32_t surfaceZ = tile_element_height(loc.ToTileCentre()); diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 2b67b61f9d..38afeca016 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -299,7 +299,7 @@ GameActionResult::Ptr tile_inspector_paste_element_at(const CoordsXY& loc, TileE { return std::make_unique(GA_ERROR::NO_FREE_ELEMENTS, STR_NONE); } - + auto tileLoc = TileCoordsXY(loc); if (isExecuting)