summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend/mame/luaengine_input.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontend/mame/luaengine_input.cpp')
-rw-r--r--src/frontend/mame/luaengine_input.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/frontend/mame/luaengine_input.cpp b/src/frontend/mame/luaengine_input.cpp
index bb69ca4bd28..04db2a13e84 100644
--- a/src/frontend/mame/luaengine_input.cpp
+++ b/src/frontend/mame/luaengine_input.cpp
@@ -494,7 +494,7 @@ void lua_engine::initialize_input(sol::table &emu)
[this] (input_device &dev)
{
sol::table result = sol().create_table();
- for (input_item_id id = ITEM_ID_FIRST_VALID; id < dev.maxitem(); id++)
+ for (input_item_id id = ITEM_ID_FIRST_VALID; id <= dev.maxitem(); id++)
{
input_device_item *item = dev.item(id);
if (item)
@@ -512,16 +512,9 @@ void lua_engine::initialize_input(sol::table &emu)
auto uiinput_type = sol().registry().new_usertype<ui_input_manager>("uiinput", sol::no_constructor);
- uiinput_type["find_mouse"] =
- [] (ui_input_manager &ui)
- {
- int32_t x, y;
- bool button;
- render_target *rt = ui.find_mouse(&x, &y, &button);
- return std::make_tuple(x, y, button, rt);
- };
- uiinput_type["pressed"] = &ui_input_manager::pressed;
- uiinput_type["pressed_repeat"] = &ui_input_manager::pressed_repeat;
+ uiinput_type.set_function("reset", &ui_input_manager::reset);
+ uiinput_type.set_function("pressed", &ui_input_manager::pressed);
+ uiinput_type.set_function("pressed_repeat", &ui_input_manager::pressed_repeat);
uiinput_type["presses_enabled"] = sol::property(&ui_input_manager::presses_enabled, &ui_input_manager::set_presses_enabled);
}