summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend
diff options
context:
space:
mode:
authorGravatarGravatar cracyc <cracyc@users.noreply.github.com>2019-11-20 21:35:35 -0600
committerGravatarGravatar cracyc <cracyc@users.noreply.github.com>2019-11-20 21:35:35 -0600
commit0606a77760325b7778f1dd47f78cbf48b8126d25 (patch)
treed9cf241de5efd983ae5ed920318988fa6e59be89 /src/frontend
parent4f613c53057d60e04573b29778f738c69f5f964f (diff)
plugins/cheat: show pressed buttons when setting hotkeys (nw)
Diffstat (limited to 'src/frontend')
-rw-r--r--src/frontend/mame/luaengine.cpp27
1 files changed, 23 insertions, 4 deletions
diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp
index 8c5ab6888a1..6cb15537b7e 100644
--- a/src/frontend/mame/luaengine.cpp
+++ b/src/frontend/mame/luaengine.cpp
@@ -2113,12 +2113,31 @@ void lua_engine::initialize()
else
m_seq_poll->start(cls);
});
- input_type.set("seq_poll", [this](input_manager &input) {
- return m_seq_poll->poll();
+ input_type.set("seq_poll", [this](input_manager &input) -> sol::object {
+ if (!m_seq_poll)
+ return sol::make_object(sol(), sol::nil);
+ return sol::make_object(sol(), m_seq_poll->poll());
+ });
+ input_type.set("seq_poll_final", [this](input_manager &input) -> sol::object {
+ if (!m_seq_poll)
+ return sol::make_object(sol(), sol::nil);
+ return sol::make_object(sol(), sol::make_user(m_seq_poll->valid() ? m_seq_poll->sequence() : input_seq()));
+ });
+ input_type.set("seq_poll_modified", [this](input_manager &input) -> sol::object {
+ if (!m_seq_poll)
+ return sol::make_object(sol(), sol::nil);
+ return sol::make_object(sol(), m_seq_poll->modified());
});
- input_type.set("seq_poll_final", [this](input_manager &input) {
- return sol::make_user(m_seq_poll->valid() ? m_seq_poll->sequence() : input_seq());
+ input_type.set("seq_poll_valid", [this](input_manager &input) -> sol::object {
+ if (!m_seq_poll)
+ return sol::make_object(sol(), sol::nil);
+ return sol::make_object(sol(), m_seq_poll->valid());
});
+ input_type.set("seq_poll_sequence", [this](input_manager &input) -> sol::object {
+ if (!m_seq_poll)
+ return sol::make_object(sol(), sol::nil);
+ return sol::make_object(sol(), sol::make_user(m_seq_poll->sequence()));
+ });
input_type.set("device_classes", sol::property([this](input_manager &input) {
sol::table result = sol().create_table();
for (input_device_class devclass_id = DEVICE_CLASS_FIRST_VALID; devclass_id <= DEVICE_CLASS_LAST_VALID; devclass_id++)