From eddda64e20fc55f4eab6651bb9b723518b9887b7 Mon Sep 17 00:00:00 2001 From: LordOfLunacy <64547205+LordOfLunacy@users.noreply.github.com> Date: Fri, 13 May 2022 19:59:47 -0400 Subject: [PATCH] Fixed formatting --- src/openrct2/GameState.cpp | 2 +- src/openrct2/entity/Peep.cpp | 1 - src/openrct2/peep/GuestPathfinding.h | 5 +---- test/tests/Pathfinding.cpp | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index 190017df95..70ec004eda 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -9,6 +9,7 @@ #include "GameState.h" +#include "./peep/GuestPathfinding.h" #include "Context.h" #include "Editor.h" #include "Game.h" @@ -27,7 +28,6 @@ #include "localisation/Localisation.h" #include "management/NewsItem.h" #include "network/network.h" -#include "./peep/GuestPathfinding.h" #include "platform/Platform.h" #include "profiling/Profiling.h" #include "ride/Vehicle.h" diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index a096212f11..bdf0fd01b2 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -81,7 +81,6 @@ static void* _crowdSoundChannel = nullptr; static void peep_128_tick_update(Peep* peep, int32_t index); static void peep_release_balloon(Guest* peep, int16_t spawn_height); - static PeepActionSpriteType PeepSpecialSpriteToSpriteTypeMap[] = { PeepActionSpriteType::None, PeepActionSpriteType::HoldMat, diff --git a/src/openrct2/peep/GuestPathfinding.h b/src/openrct2/peep/GuestPathfinding.h index 3e409de77c..9222e2f635 100644 --- a/src/openrct2/peep/GuestPathfinding.h +++ b/src/openrct2/peep/GuestPathfinding.h @@ -17,8 +17,6 @@ struct Peep; struct Guest; struct TileElement; - - // The tile position of the place the peep is trying to get to (park entrance/exit, ride // entrance/exit, or the end of the queue line for a ride). // @@ -55,7 +53,6 @@ public: // // Returns 0 if the guest has successfully had a new destination set up, nonzero otherwise. virtual int32_t guest_path_finding(Guest* peep) = 0; - }; class OriginalPathfinding : public GuestPathfinding @@ -73,7 +70,7 @@ private: int32_t GuestPathFindParkEntranceLeaving(Peep* peep, uint8_t edges); }; -//TODO: Implement a better solution than a global variable for the utilized pathfinder +// TODO: Implement a better solution than a global variable for the utilized pathfinder extern GuestPathfinding* gGuestPathfinder; #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 diff --git a/test/tests/Pathfinding.cpp b/test/tests/Pathfinding.cpp index 35beed443c..faf1c35503 100644 --- a/test/tests/Pathfinding.cpp +++ b/test/tests/Pathfinding.cpp @@ -16,7 +16,6 @@ using namespace OpenRCT2; - static std::ostream& operator<<(std::ostream& os, const TileCoordsXYZ& coords) { return os << "(" << coords.x << ", " << coords.y << ", " << coords.z << ")";