summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author cracyc <cracyc@users.noreply.github.com>2017-07-14 13:20:46 -0500
committer cracyc <cracyc@users.noreply.github.com>2017-07-14 13:20:46 -0500
commit229959ee7df1fb8f7acb803d3cfa90b06f837e73 (patch)
tree5acfca72c65e4bfb6f2aeae8f09e00337f494c54
parent1dc8a90131ea36633a6b68ab93f39fa2f00c1625 (diff)
plugins/cheat: popmessage for hotkey setting (nw)
-rw-r--r--plugins/cheat/init.lua4
-rw-r--r--src/frontend/mame/luaengine.cpp1
2 files changed, 5 insertions, 0 deletions
diff --git a/plugins/cheat/init.lua b/plugins/cheat/init.lua
index 56da68dbc56..aa7bd0e406c 100644
--- a/plugins/cheat/init.lua
+++ b/plugins/cheat/init.lua
@@ -352,10 +352,14 @@ function cheat.startplugin()
local function hkcbfunc(cheat)
local input = manager:machine():input()
+ manager:machine():popmessage("Press button for hotkey or wait to clear")
+ manager:machine():video():frame_update(true)
input:seq_poll_start("switch")
local time = os.clock()
while (not input:seq_poll()) and (os.clock() < time + 1) do end
cheat.hotkeys = {pressed = false, keys = input:seq_poll_final()}
+ manager:machine():popmessage()
+ manager:machine():video():frame_update(true)
end
for num, cheat in ipairs(cheats) do
diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp
index 1cf1f2133e4..bc92f4b3c9f 100644
--- a/src/frontend/mame/luaengine.cpp
+++ b/src/frontend/mame/luaengine.cpp
@@ -1445,6 +1445,7 @@ void lua_engine::initialize()
"skip_this_frame", &video_manager::skip_this_frame,
"speed_factor", &video_manager::speed_factor,
"speed_percent", &video_manager::speed_percent,
+ "frame_update", &video_manager::frame_update,
"frameskip", sol::property(&video_manager::frameskip, &video_manager::set_frameskip),
"throttled", sol::property(&video_manager::throttled, &video_manager::set_throttled),
"throttle_rate", sol::property(&video_manager::throttle_rate, &video_manager::set_throttle_rate));