From 1d8ee7984f1fef4e8cd2a4b377271bb1a50f7859 Mon Sep 17 00:00:00 2001 From: uramer Date: Tue, 2 Jan 2024 13:45:45 +0100 Subject: [PATCH] Make input.triggers[] consistent with input.actions[] --- components/lua/inputactions.cpp | 8 ++++++++ components/lua/inputactions.hpp | 6 +----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/components/lua/inputactions.cpp b/components/lua/inputactions.cpp index c21fbcf112..69c91921eb 100644 --- a/components/lua/inputactions.cpp +++ b/components/lua/inputactions.cpp @@ -265,6 +265,14 @@ namespace LuaUtil mHandlers.push_back({}); } + std::optional Registry::operator[](std::string_view key) + { + auto iter = mIds.find(key); + if (iter == mIds.end()) + return std::nullopt; + return mInfo[iter->second]; + } + void Registry::registerHandler(std::string_view key, const LuaUtil::Callback& callback) { Id id = safeIdByKey(key); diff --git a/components/lua/inputactions.hpp b/components/lua/inputactions.hpp index ac3907b55d..abc6cf73fa 100644 --- a/components/lua/inputactions.hpp +++ b/components/lua/inputactions.hpp @@ -126,11 +126,7 @@ namespace LuaUtil::InputTrigger return std::nullopt; return it->first; } - std::optional operator[](std::string_view key) - { - Id id = safeIdByKey(key); - return mInfo[id]; - } + std::optional operator[](std::string_view key); void insert(Info info); void registerHandler(std::string_view key, const LuaUtil::Callback& callback); void activate(std::string_view key);