summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/luaengine.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-26 15:02:12 +0100
committer ImJezze <jezze@gmx.net>2016-03-26 15:02:12 +0100
commit317222676e1ad379ae6a29450b46e8abdabbffaf (patch)
treebcb080b8dc67beca76bb3c61d0255acf59cfd093 /src/emu/luaengine.cpp
parent41595c05c43c3ec1284af86e09ea5a283c586421 (diff)
parent822c2689b0cf22807ed87be1123a439ab623a623 (diff)
Merge pull request #17 from mamedev/master
Sync to base master
Diffstat (limited to 'src/emu/luaengine.cpp')
-rw-r--r--src/emu/luaengine.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 7b384fa62e9..0cf57ef61c0 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -1436,6 +1436,7 @@ void lua_engine::initialize()
.beginClass <machine_manager> ("manager")
.addFunction ("machine", &machine_manager::machine)
.addFunction ("options", &machine_manager::options)
+ .addFunction ("plugins", &machine_manager::plugins)
.endClass ()
.beginClass <lua_machine> ("lua_machine")
.addCFunction ("popmessage", &lua_machine::l_popmessage)
@@ -1564,6 +1565,8 @@ void lua_engine::initialize()
.endClass()
.deriveClass <ui_options, core_options> ("ui_options")
.endClass()
+ .deriveClass <plugin_options, core_options> ("plugin_options")
+ .endClass()
.beginClass <parameters_manager> ("parameters")
.addFunction ("add", &parameters_manager::add)
.addFunction ("lookup", &parameters_manager::lookup)