From 92f50efedc135adde181d75d223e4e42b55ed4e0 Mon Sep 17 00:00:00 2001 From: Richard Fine Date: Sun, 1 Sep 2019 19:10:27 +0100 Subject: [PATCH] Formatting fixes --- src/openrct2/peep/GuestPathfinding.cpp | 7 ++++--- src/openrct2/peep/Peep.h | 2 +- src/openrct2/world/Location.hpp | 9 ++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index 31d2b67b16..fe97345d05 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -275,7 +275,8 @@ static uint8_t footpath_element_next_in_direction(TileCoordsXYZ loc, PathElement * * This is the recursive portion of footpath_element_destination_in_direction(). */ -static uint8_t footpath_element_dest_in_dir(TileCoordsXYZ loc, Direction chosenDirection, ride_id_t* outRideIndex, int32_t level) +static uint8_t footpath_element_dest_in_dir( + TileCoordsXYZ loc, Direction chosenDirection, ride_id_t* outRideIndex, int32_t level) { TileElement* tileElement; Direction direction; @@ -596,8 +597,8 @@ static int32_t CalculateHeuristicPathingScore(TileCoordsXYZ loc1, TileCoordsXYZ */ static void peep_pathfind_heuristic_search( TileCoordsXYZ loc, Peep* peep, TileElement* currentTileElement, bool inPatrolArea, uint8_t counter, uint16_t* endScore, - Direction test_edge, uint8_t* endJunctions, TileCoordsXYZ junctionList[16], uint8_t directionList[16], TileCoordsXYZ* endXYZ, - uint8_t* endSteps) + Direction test_edge, uint8_t* endJunctions, TileCoordsXYZ junctionList[16], uint8_t directionList[16], + TileCoordsXYZ* endXYZ, uint8_t* endSteps) { uint8_t searchResult = PATH_SEARCH_FAILED; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 9e272e85ae..4474244de6 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -615,7 +615,7 @@ struct Peep : rct_sprite_common union { uint8_t maze_last_edge; // 0x78 - Direction direction; // Direction ? + Direction direction; // Direction ? }; uint8_t interaction_ride_index; uint16_t time_in_queue; // 0x7A diff --git a/src/openrct2/world/Location.hpp b/src/openrct2/world/Location.hpp index 34fa4f1c21..03abf81c7c 100644 --- a/src/openrct2/world/Location.hpp +++ b/src/openrct2/world/Location.hpp @@ -270,7 +270,8 @@ typedef uint8_t Direction; const Direction INVALID_DIRECTION = 0xFF; /** - * Array of all valid cardinal directions, to make it easy to write range-based for loops like: for (Direction d : ALL_DIRECTIONS) + * Array of all valid cardinal directions, to make it easy to write range-based for loops like: + * for (Direction d : ALL_DIRECTIONS) */ constexpr Direction ALL_DIRECTIONS[] = { 0, 1, 2, 3 }; @@ -289,7 +290,8 @@ constexpr Direction ALL_DIRECTIONS[] = { 0, 1, 2, 3 }; } /** - * Given a direction, return the next cardinal direction, wrapping around if necessary. (TODO: Figure out if this is CW or CCW) + * Given a direction, return the next cardinal direction, wrapping around if necessary. + * (TODO: Figure out if this is CW or CCW) */ [[maybe_unused]] static constexpr Direction direction_next(Direction dir) { @@ -297,7 +299,8 @@ constexpr Direction ALL_DIRECTIONS[] = { 0, 1, 2, 3 }; } /** - * Given a direction, return the previous cardinal direction, wrapping around if necessary. (TODO: Figure out if this is CW or CCW) + * Given a direction, return the previous cardinal direction, wrapping around if necessary. + * (TODO: Figure out if this is CW or CCW) */ [[maybe_unused]] static constexpr Direction direction_prev(Direction dir) {