summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/mame.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
committer ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
commitcc24a339d8c0517259084b5c178d784626ba965c (patch)
tree9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/emu/mame.h
parentb5daabda5495dea5c50e17961ecfed2ea8619d76 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/emu/mame.h')
-rw-r--r--src/emu/mame.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/emu/mame.h b/src/emu/mame.h
index eb2f510c114..bc21d805716 100644
--- a/src/emu/mame.h
+++ b/src/emu/mame.h
@@ -55,18 +55,8 @@ public:
static const char * get_appname();
static const char * get_appname_lower();
static const char * get_configname();
- static const char * get_capgamenoun();
- static const char * get_capstartgamenoun();
- static const char * get_gamenoun();
- static const char * get_gamesnoun();
static const char * get_copyright();
static const char * get_copyright_info();
- static const char * get_disclaimer();
- static const char * get_usage();
- static const char * get_xml_root();
- static const char * get_xml_top();
- static const char * get_state_magic_num();
- static void printf_usage(const char *par1, const char *par2);
};
class lua_engine;
@@ -96,6 +86,7 @@ public:
/* execute as configured by the OPTION_SYSTEMNAME option on the specified options */
int execute();
+ void start_luaengine();
void schedule_new_driver(const game_driver &driver);
private:
osd_interface & m_osd; // reference to OSD system