summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorGravatarGravatar cracyc <cracyc@users.noreply.github.com>2019-08-31 08:41:28 -0500
committerGravatarGravatar GitHub <noreply@github.com>2019-08-31 08:41:28 -0500
commitc8cde9b1e3e9095fc2262a47f95e8586c65c7946 (patch)
treef577c1fc3e710e86163cd3ec9e6437fa9adaad84
parent730984842d83959029fb0728a48ca4936896809f (diff)
parent4732ef1a5904dcd25728b06e230075eb2465d923 (diff)
Merge pull request #5565 from npwoods/lua_exit_and_hard_reset_pending
Exposing running_machine::exit_pending() and running_machine::hard_reset_pending() to LUA
-rw-r--r--src/emu/machine.h1
-rw-r--r--src/frontend/mame/luaengine.cpp6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 2d1c8fe2613..8d151bc0c92 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -193,6 +193,7 @@ public:
machine_phase phase() const { return m_current_phase; }
bool paused() const { return m_paused || (m_current_phase != machine_phase::RUNNING); }
bool exit_pending() const { return m_exit_pending; }
+ bool hard_reset_pending() const { return m_hard_reset_pending; }
bool ui_active() const { return m_ui_active; }
const char *basename() const { return m_basename.c_str(); }
int sample_rate() const { return m_sample_rate; }
diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp
index df730b7019f..5416598b5d9 100644
--- a/src/frontend/mame/luaengine.cpp
+++ b/src/frontend/mame/luaengine.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Miodrag Milanovic,Luca Bruno
/***************************************************************************
- luaengine.c
+ luaengine.cpp
Controls execution of the core MAME system.
@@ -1247,6 +1247,8 @@ void lua_engine::initialize()
*
* machine.paused - get paused state
* machine.samplerate - get audio sample rate
+ * machine.exit_pending
+ * machine.hard_reset_pending
*
* machine.devices[] - get device table (k=tag, v=device_t)
* machine.screens[] - get screens table (k=tag, v=screen_device)
@@ -1277,6 +1279,8 @@ void lua_engine::initialize()
},
"paused", sol::property(&running_machine::paused),
"samplerate", sol::property(&running_machine::sample_rate),
+ "exit_pending", sol::property(&running_machine::exit_pending),
+ "hard_reset_pending", sol::property(&running_machine::hard_reset_pending),
"devices", sol::property([this](running_machine &m) {
std::function<void(device_t &, sol::table)> tree;
sol::table table = sol().create_table();