From 92f3e2de8b79fd515884448f90dc38867515108d Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sun, 18 Aug 2019 12:37:41 +0100 Subject: [PATCH] Pass by const reference where possible --- src/openrct2/world/Map.cpp | 32 ++++++++++++++++---------------- src/openrct2/world/Map.h | 32 ++++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index d25b41a2c0..db2b487bef 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -247,12 +247,12 @@ SurfaceElement* map_get_surface_element_at(int32_t x, int32_t y) return tileElement->AsSurface(); } -SurfaceElement* map_get_surface_element_at(const CoordsXY coords) +SurfaceElement* map_get_surface_element_at(const CoordsXY& coords) { return map_get_surface_element_at(coords.x / 32, coords.y / 32); } -PathElement* map_get_path_element_at(const TileCoordsXYZ loc) +PathElement* map_get_path_element_at(const TileCoordsXYZ& loc) { TileElement* tileElement = map_get_first_element_at(loc.x, loc.y); @@ -432,7 +432,7 @@ void map_update_tile_pointers() * dx: return remember to & with 0xFFFF if you don't want water affecting results * rct2: 0x00662783 */ -int16_t tile_element_height(const CoordsXY loc) +int16_t tile_element_height(const CoordsXY& loc) { // Off the map if ((unsigned)loc.x >= 8192 || (unsigned)loc.y >= 8192) @@ -578,7 +578,7 @@ int16_t tile_element_height(const CoordsXY loc) return height; } -int16_t tile_element_water_height(const CoordsXY loc) +int16_t tile_element_water_height(const CoordsXY& loc) { // Off the map if ((unsigned)loc.x >= 8192 || (unsigned)loc.y >= 8192) @@ -601,7 +601,7 @@ int16_t tile_element_water_height(const CoordsXY loc) * Checks if the tile at coordinate at height counts as connected. * @return 1 if connected, 0 otherwise */ -bool map_coord_is_connected(const TileCoordsXYZ loc, uint8_t faceDirection) +bool map_coord_is_connected(const TileCoordsXYZ& loc, uint8_t faceDirection) { TileElement* tileElement = map_get_first_element_at(loc.x, loc.y); @@ -674,7 +674,7 @@ void map_update_path_wide_flags() * * rct2: 0x006A7B84 */ -int32_t map_height_from_slope(const CoordsXY coords, int32_t slope, bool isSloped) +int32_t map_height_from_slope(const CoordsXY& coords, int32_t slope, bool isSloped) { if (!isSloped) return 0; @@ -693,19 +693,19 @@ int32_t map_height_from_slope(const CoordsXY coords, int32_t slope, bool isSlope return 0; } -bool map_is_location_valid(const CoordsXY coords) +bool map_is_location_valid(const CoordsXY& coords) { const bool is_x_valid = coords.x < (MAXIMUM_MAP_SIZE_TECHNICAL * 32) && coords.x >= 0; const bool is_y_valid = coords.y < (MAXIMUM_MAP_SIZE_TECHNICAL * 32) && coords.y >= 0; return is_x_valid && is_y_valid; } -bool map_is_edge(const CoordsXY coords) +bool map_is_edge(const CoordsXY& coords) { return (coords.x < 32 || coords.y < 32 || coords.x >= gMapSizeUnits || coords.y >= gMapSizeUnits); } -bool map_can_build_at(CoordsXYZ loc) +bool map_can_build_at(const CoordsXYZ& loc) { if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) return true; @@ -720,7 +720,7 @@ bool map_can_build_at(CoordsXYZ loc) * * rct2: 0x00664F72 */ -bool map_is_location_owned(CoordsXYZ loc) +bool map_is_location_owned(const CoordsXYZ& loc) { // This check is to avoid throwing lots of messages in logs. if (map_is_location_valid(loc)) @@ -747,7 +747,7 @@ bool map_is_location_owned(CoordsXYZ loc) * * rct2: 0x00664F2C */ -bool map_is_location_in_park(const CoordsXY coords) +bool map_is_location_in_park(const CoordsXY& coords) { if (map_is_location_valid(coords)) { @@ -762,7 +762,7 @@ bool map_is_location_in_park(const CoordsXY coords) return false; } -bool map_is_location_owned_or_has_rights(CoordsXY loc) +bool map_is_location_owned_or_has_rights(const CoordsXY& loc) { if (map_is_location_valid(loc)) { @@ -885,7 +885,7 @@ int32_t tile_element_get_corner_height(const SurfaceElement* surfaceElement, int return map_get_corner_height(z, slope, direction); } -uint8_t map_get_lowest_land_height(const MapRange range) +uint8_t map_get_lowest_land_height(const MapRange& range) { MapRange validRange = { std::max(range.GetLeft(), 32), std::max(range.GetTop(), 32), std::min(range.GetRight(), (int32_t)gMapSizeMaxXY), @@ -906,7 +906,7 @@ uint8_t map_get_lowest_land_height(const MapRange range) return min_height; } -uint8_t map_get_highest_land_height(const MapRange range) +uint8_t map_get_highest_land_height(const MapRange& range) { MapRange validRange = { std::max(range.GetLeft(), 32), std::max(range.GetTop(), 32), std::min(range.GetRight(), (int32_t)gMapSizeMaxXY), @@ -933,7 +933,7 @@ uint8_t map_get_highest_land_height(const MapRange range) return max_height; } -bool map_is_location_at_edge(const CoordsXY loc) +bool map_is_location_at_edge(const CoordsXY& loc) { return loc.x < 32 || loc.y < 32 || loc.x >= ((MAXIMUM_MAP_SIZE_TECHNICAL - 1) * 32) || loc.y >= ((MAXIMUM_MAP_SIZE_TECHNICAL - 1) * 32); @@ -1153,7 +1153,7 @@ bool map_check_free_elements_and_reorganise(int32_t numElements) * * rct2: 0x0068B1F6 */ -TileElement* tile_element_insert(const TileCoordsXYZ loc, int32_t flags) +TileElement* tile_element_insert(const TileCoordsXYZ& loc, int32_t flags) { TileElement *originalTileElement, *newTileElement, *insertedElement; diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index 896043c7ce..5bf3e43e4a 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -141,30 +141,30 @@ void map_update_tile_pointers(); TileElement* map_get_first_element_at(int32_t x, int32_t y); TileElement* map_get_nth_element_at(int32_t x, int32_t y, int32_t n); void map_set_tile_elements(int32_t x, int32_t y, TileElement* elements); -int32_t map_height_from_slope(CoordsXY coords, int32_t slope, bool isSloped); +int32_t map_height_from_slope(const CoordsXY& coords, int32_t slope, bool isSloped); BannerElement* map_get_banner_element_at(int32_t x, int32_t y, int32_t z, uint8_t direction); SurfaceElement* map_get_surface_element_at(int32_t x, int32_t y); -SurfaceElement* map_get_surface_element_at(CoordsXY coords); -PathElement* map_get_path_element_at(const TileCoordsXYZ loc); +SurfaceElement* map_get_surface_element_at(const CoordsXY& coords); +PathElement* map_get_path_element_at(const TileCoordsXYZ& loc); WallElement* map_get_wall_element_at(int32_t x, int32_t y, int32_t z, int32_t direction); SmallSceneryElement* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, int32_t type, uint8_t quadrant); EntranceElement* map_get_park_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost); EntranceElement* map_get_ride_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost); EntranceElement* map_get_ride_exit_element_at(int32_t x, int32_t y, int32_t z, bool ghost); -int16_t tile_element_height(const CoordsXY loc); -int16_t tile_element_water_height(const CoordsXY loc); -uint8_t map_get_highest_land_height(const MapRange range); -uint8_t map_get_lowest_land_height(const MapRange range); -bool map_coord_is_connected(const TileCoordsXYZ loc, uint8_t faceDirection); +int16_t tile_element_height(const CoordsXY& loc); +int16_t tile_element_water_height(const CoordsXY& loc); +uint8_t map_get_highest_land_height(const MapRange& range); +uint8_t map_get_lowest_land_height(const MapRange& range); +bool map_coord_is_connected(const TileCoordsXYZ& loc, uint8_t faceDirection); void map_remove_provisional_elements(); void map_restore_provisional_elements(); void map_update_path_wide_flags(); -bool map_is_location_valid(CoordsXY coords); -bool map_is_edge(CoordsXY coords); -bool map_can_build_at(CoordsXYZ loc); -bool map_is_location_owned(CoordsXYZ loc); -bool map_is_location_in_park(CoordsXY coords); -bool map_is_location_owned_or_has_rights(CoordsXY loc); +bool map_is_location_valid(const CoordsXY& coords); +bool map_is_edge(const CoordsXY& coords); +bool map_can_build_at(const CoordsXYZ& loc); +bool map_is_location_owned(const CoordsXYZ& loc); +bool map_is_location_in_park(const CoordsXY& coords); +bool map_is_location_owned_or_has_rights(const CoordsXY& loc); bool map_surface_is_blocked(int16_t x, int16_t y); void tile_element_remove(TileElement* tileElement); void map_remove_all_rides(); @@ -172,7 +172,7 @@ void map_invalidate_map_selection_tiles(); void map_invalidate_selection_rect(); void map_reorganise_elements(); bool map_check_free_elements_and_reorganise(int32_t num_elements); -TileElement* tile_element_insert(const TileCoordsXYZ loc, int32_t flags); +TileElement* tile_element_insert(const TileCoordsXYZ& loc, int32_t flags); using CLEAR_FUNC = int32_t (*)(TileElement** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price); @@ -245,7 +245,7 @@ TileElement* map_get_track_element_at_from_ride(int32_t x, int32_t y, int32_t z, TileElement* map_get_track_element_at_with_direction_from_ride( int32_t x, int32_t y, int32_t z, int32_t direction, ride_id_t rideIndex); -bool map_is_location_at_edge(const CoordsXY loc); +bool map_is_location_at_edge(const CoordsXY& loc); void map_obstruction_set_error_text(TileElement* tileElement); uint16_t check_max_allowable_land_rights_for_tile(uint8_t x, uint8_t y, uint8_t base_z);