diff options
| author | 2016-04-23 17:08:59 +0200 | |
|---|---|---|
| committer | 2016-04-23 17:08:59 +0200 | |
| commit | 3fc8cfd6794da642a32f0d86c8d3fc290c6b7911 (patch) | |
| tree | 9be2a9b88fdad1862d1231ab7f09122ccf67337c /src/frontend | |
| parent | a931b486fee9b71aed4399ac908f90fdcd6c22d5 (diff) | |
fix lua issue (nw)
Diffstat (limited to 'src/frontend')
| -rw-r--r-- | src/frontend/mame/luaengine.cpp | 14 | ||||
| -rw-r--r-- | src/frontend/mame/mame.h | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp index b8d8644218a..95245c2db73 100644 --- a/src/frontend/mame/luaengine.cpp +++ b/src/frontend/mame/luaengine.cpp @@ -2169,10 +2169,13 @@ void lua_engine::initialize() .addCFunction ("print_error", l_osd_printf_error ) .addCFunction ("print_info", l_osd_printf_info ) .addCFunction ("print_debug", l_osd_printf_debug ) - .beginClass <mame_machine_manager> ("manager") - .addFunction ("machine", &machine_manager::machine) - .addFunction ("options", &machine_manager::options) + .beginClass <machine_manager>("manager") + .addFunction("machine", &machine_manager::machine) + .addFunction("options", &machine_manager::options) + .endClass() + .beginClass <mame_machine_manager> ("mame_manager") .addFunction ("plugins", &mame_machine_manager::plugins) + .addFunction ("cheat", &mame_machine_manager::cheat) .endClass () .beginClass <lua_machine> ("lua_machine") .addCFunction ("popmessage", &lua_machine::l_popmessage) @@ -2190,7 +2193,6 @@ void lua_engine::initialize() .addFunction ("render", &running_machine::render) .addFunction ("ioport", &running_machine::ioport) .addFunction ("parameters", &running_machine::parameters) - .addFunction ("cheat", &mame_machine_manager::cheat) .addFunction ("memory", &running_machine::memory) .addFunction ("options", &running_machine::options) .addFunction ("outputs", &running_machine::output) @@ -2501,8 +2503,10 @@ void lua_engine::initialize() .endClass() .endNamespace(); - luabridge::push (m_lua_state, mame_machine_manager::instance()); + luabridge::push (m_lua_state, (machine_manager*)mame_machine_manager::instance()); lua_setglobal(m_lua_state, "manager"); + luabridge::push(m_lua_state, mame_machine_manager::instance()); + lua_setglobal(m_lua_state, "mame_manager"); } void lua_engine::start_console() diff --git a/src/frontend/mame/mame.h b/src/frontend/mame/mame.h index 33ce991e685..9b96982eae2 100644 --- a/src/frontend/mame/mame.h +++ b/src/frontend/mame/mame.h @@ -35,7 +35,7 @@ class mame_ui_manager; // ======================> machine_manager -class mame_machine_manager : machine_manager +class mame_machine_manager : public machine_manager { DISABLE_COPYING(mame_machine_manager); private: |
