diff options
Diffstat (limited to 'src/emu/emuopts.h')
-rw-r--r-- | src/emu/emuopts.h | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index c8bbc58435a..14597d0e67d 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -56,7 +56,6 @@ enum #define OPTION_FONTPATH "fontpath" #define OPTION_CHEATPATH "cheatpath" #define OPTION_CROSSHAIRPATH "crosshairpath" -#define OPTION_PLUGINSPATH "pluginspath" // core directory options #define OPTION_CFG_DIRECTORY "cfg_directory" @@ -72,8 +71,6 @@ enum #define OPTION_AUTOSAVE "autosave" #define OPTION_PLAYBACK "playback" #define OPTION_RECORD "record" -#define OPTION_RECORD_TIMECODE "record_timecode" -#define OPTION_EXIT_AFTER_PLAYBACK "exit_after_playback" #define OPTION_MNGWRITE "mngwrite" #define OPTION_AVIWRITE "aviwrite" #ifdef MAME_DEBUG @@ -175,7 +172,8 @@ enum #define OPTION_DRC_LOG_NATIVE "drc_log_native" #define OPTION_BIOS "bios" #define OPTION_CHEAT "cheat" -#define OPTION_UI "ui" +#define OPTION_SKIP_GAMEINFO "skip_gameinfo" +#define OPTION_UI_FONT "uifont" #define OPTION_RAMSIZE "ramsize" // core comm options @@ -184,6 +182,9 @@ enum #define OPTION_COMM_REMOTE_HOST "comm_remotehost" #define OPTION_COMM_REMOTE_PORT "comm_remoteport" +#define OPTION_CONFIRM_QUIT "confirm_quit" +#define OPTION_UI_MOUSE "ui_mouse" + #define OPTION_AUTOBOOT_COMMAND "autoboot_command" #define OPTION_AUTOBOOT_DELAY "autoboot_delay" #define OPTION_AUTOBOOT_SCRIPT "autoboot_script" @@ -196,7 +197,6 @@ enum // forward references struct game_driver; -class software_part; class emu_options : public core_options @@ -210,7 +210,7 @@ public: // parsing wrappers bool parse_command_line(int argc, char *argv[], std::string &error_string); void parse_standard_inis(std::string &error_string); - bool parse_slot_devices(int argc, char *argv[], std::string &error_string, const char *name = nullptr, const char *value = nullptr, const software_part *swpart = nullptr); + bool parse_slot_devices(int argc, char *argv[], std::string &error_string, const char *name, const char *value); // core options const char *system_name() const { return value(OPTION_SYSTEMNAME); } @@ -232,7 +232,6 @@ public: const char *font_path() const { return value(OPTION_FONTPATH); } const char *cheat_path() const { return value(OPTION_CHEATPATH); } const char *crosshair_path() const { return value(OPTION_CROSSHAIRPATH); } - const char *plugins_path() const { return value(OPTION_PLUGINSPATH); } // core directory options const char *cfg_directory() const { return value(OPTION_CFG_DIRECTORY); } @@ -248,8 +247,6 @@ public: bool autosave() const { return bool_value(OPTION_AUTOSAVE); } const char *playback() const { return value(OPTION_PLAYBACK); } const char *record() const { return value(OPTION_RECORD); } - bool record_timecode() const { return bool_value(OPTION_RECORD_TIMECODE); } - bool exit_after_playback() const { return bool_value(OPTION_EXIT_AFTER_PLAYBACK); } const char *mng_write() const { return value(OPTION_MNGWRITE); } const char *avi_write() const { return value(OPTION_AVIWRITE); } #ifdef MAME_DEBUG @@ -349,7 +346,8 @@ public: bool drc_log_native() const { return bool_value(OPTION_DRC_LOG_NATIVE); } const char *bios() const { return value(OPTION_BIOS); } bool cheat() const { return bool_value(OPTION_CHEAT); } - const char *ui() const { return value(OPTION_UI); } + bool skip_gameinfo() const { return bool_value(OPTION_SKIP_GAMEINFO); } + const char *ui_font() const { return value(OPTION_UI_FONT); } const char *ram_size() const { return value(OPTION_RAMSIZE); } // core comm options @@ -357,7 +355,10 @@ public: const char *comm_localport() const { return value(OPTION_COMM_LOCAL_PORT); } const char *comm_remotehost() const { return value(OPTION_COMM_REMOTE_HOST); } const char *comm_remoteport() const { return value(OPTION_COMM_REMOTE_PORT); } - + + bool confirm_quit() const { return bool_value(OPTION_CONFIRM_QUIT); } + bool ui_mouse() const { return bool_value(OPTION_UI_MOUSE); } + const char *autoboot_command() const { return value(OPTION_AUTOBOOT_COMMAND); } int autoboot_delay() const { return int_value(OPTION_AUTOBOOT_DELAY); } const char *autoboot_script() const { return value(OPTION_AUTOBOOT_SCRIPT); } @@ -369,13 +370,12 @@ public: std::string main_value(const char *option) const; std::string sub_value(const char *name, const char *subname) const; - bool add_slot_options(const software_part *swpart = nullptr); - + bool add_slot_options(bool isfirst); private: // device-specific option handling - void add_device_options(); - void update_slot_options(const software_part *swpart = nullptr); + void add_device_options(bool isfirst); + void update_slot_options(); // INI parsing helper bool parse_one_ini(const char *basename, int priority, std::string *error_string = nullptr); @@ -390,8 +390,6 @@ private: bool m_joystick_contradictory; bool m_sleep; bool m_refresh_speed; - int m_slot_options; - int m_device_options; }; |