diff --git a/src/openrct2/Identifiers.h b/src/openrct2/Identifiers.h new file mode 100644 index 0000000000..d4e2f1c557 --- /dev/null +++ b/src/openrct2/Identifiers.h @@ -0,0 +1,17 @@ +/***************************************************************************** + * Copyright (c) 2014-2021 OpenRCT2 developers + * + * For a complete list of all authors, please refer to contributors.md + * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is licensed under the GNU General Public License version 3. + *****************************************************************************/ + +#pragma once + +#include "common.h" +#include "core/Identifier.hpp" + +#include + +using ParkEntranceIndex = TIdentifier::max(), struct ParkEntranceIndexTag>; diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 37ecfead94..2d5b2241db 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -209,6 +209,7 @@ + diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index a69f378546..f9b4402b59 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -9,8 +9,8 @@ #pragma once +#include "../Identifiers.h" #include "../common.h" -#include "../core/Identifier.hpp" #include "../ride/RideTypes.h" #include "../ride/Station.h" #include "../util/Util.h" @@ -33,7 +33,6 @@ namespace GameActions { class Result; } -using ParkEntranceIndex = TIdentifier::max(), struct ParkEntranceIndexTag>; enum class StaffType : uint8_t { diff --git a/src/openrct2/world/Entrance.h b/src/openrct2/world/Entrance.h index 7edfb6f304..691c395bbc 100644 --- a/src/openrct2/world/Entrance.h +++ b/src/openrct2/world/Entrance.h @@ -9,8 +9,8 @@ #pragma once +#include "../Identifiers.h" #include "../common.h" -#include "../core/Identifier.hpp" #include "Location.hpp" #include "Map.h" @@ -45,8 +45,6 @@ extern CoordsXYZD gParkEntranceGhostPosition; constexpr int32_t MaxRideEntranceOrExitHeight = 244 * COORDS_Z_STEP; -using ParkEntranceIndex = TIdentifier::max(), struct ParkEntranceIndexTag>; - extern std::vector gParkEntrances; extern CoordsXYZD gRideEntranceExitGhostPosition;