mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Ensure registration is never out of bounds with static_assert

Browse Source
This commit is contained in:
ζeh Matt
2021-11-11 16:23:50 +02:00
parent f491c97734
commit 55af69813a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/actions/GameActionRegistry.cpp
View File

@@ -102,16 +102,20 @@ namespace GameActions
using GameActionRegistry = std::array<GameActionEntry, EnumValue(GameCommand::Count)>;
static constexpr void Register(GameActionRegistry& registry, GameCommand id, GameActionFactory factory, const char* name)
template<GameCommand TId>
static constexpr void Register(GameActionRegistry& registry, GameActionFactory factory, const char* name)
{
const auto idx = static_cast<size_t>(id);
constexpr auto idx = static_cast<size_t>(TId);
static_assert(idx < EnumValue(GameCommand::Count));
registry[idx] = { factory, name };
}
template<typename T> static constexpr void Register(GameActionRegistry& registry, const char* name)
{
GameActionFactory factory = []() -> GameAction* { return new T(); };
Register(registry, T::TYPE, factory, name);
Register<T::TYPE>(registry, factory, name);
}
static constexpr GameActionRegistry BuildRegistry()