summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/frontend/mame/ui/inputopts.cpp9
-rw-r--r--src/frontend/mame/ui/miscmenu.cpp2
-rw-r--r--src/mame/mame.cpp4
-rw-r--r--src/mame/mess.cpp23
4 files changed, 8 insertions, 30 deletions
diff --git a/src/frontend/mame/ui/inputopts.cpp b/src/frontend/mame/ui/inputopts.cpp
index 6884574c6a5..ff433e72e7e 100644
--- a/src/frontend/mame/ui/inputopts.cpp
+++ b/src/frontend/mame/ui/inputopts.cpp
@@ -92,7 +92,7 @@ void menu_input_options::populate(float &customtop, float &custombottom)
bool inputmap, analog, toggle;
scan_inputs(machine(), inputmap, analog, toggle);
- item_append(_("menu-inputopts", "Input Assignments (general)"), 0, (void *)INPUTMAP_GENERAL);
+ // system-specific stuff
if (inputmap)
item_append(_("menu-inputopts", "Input Assignments (this system)"), 0, (void *)INPUTMAP_MACHINE);
if (analog)
@@ -101,11 +101,12 @@ void menu_input_options::populate(float &customtop, float &custombottom)
item_append(_("menu-inputopts", "Keyboard Selection"), 0, (void *)KEYBOARD);
if (toggle)
item_append(_("menu-inputopts", "Toggle Inputs"), 0, (void *)TOGGLES);
+ if (inputmap || analog || machine().natkeyboard().keyboard_count() || toggle)
+ item_append(menu_item_type::SEPARATOR);
- item_append(menu_item_type::SEPARATOR);
-
+ // general stuff
+ item_append(_("menu-inputopts", "Input Assignments (general)"), 0, (void *)INPUTMAP_GENERAL);
item_append(_("menu-inputopts", "Input Devices"), 0, (void *)INPUTDEV);
-
item_append(menu_item_type::SEPARATOR);
}
diff --git a/src/frontend/mame/ui/miscmenu.cpp b/src/frontend/mame/ui/miscmenu.cpp
index 58792ef56c8..55a2aab986f 100644
--- a/src/frontend/mame/ui/miscmenu.cpp
+++ b/src/frontend/mame/ui/miscmenu.cpp
@@ -453,8 +453,8 @@ void menu_crosshair::populate(float &customtop, float &custombottom)
// Make sure to keep these matched to the CROSSHAIR_VISIBILITY_xxx types
static char const *const vis_text[] = {
- N_p("menu-crosshair", "Always"),
N_p("menu-crosshair", "Never"),
+ N_p("menu-crosshair", "Always"),
N_p("menu-crosshair", "When moved") };
bool use_auto = false;
diff --git a/src/mame/mame.cpp b/src/mame/mame.cpp
index 217651fd510..c3fba77d580 100644
--- a/src/mame/mame.cpp
+++ b/src/mame/mame.cpp
@@ -13,8 +13,8 @@
#define APPNAME "MAME"
#define APPNAME_LOWER "mame"
#define CONFIGNAME "mame"
-#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttps://mamedev.org"
-#define COPYRIGHT_INFO "Copyright Nicola Salmoria and the MAME team"
+#define COPYRIGHT "Copyright MAMEdev and contributors\nhttps://mamedev.org"
+#define COPYRIGHT_INFO "Copyright MAMEdev and contributors"
const char * emulator_info::get_appname() { return APPNAME;}
const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
diff --git a/src/mame/mess.cpp b/src/mame/mess.cpp
deleted file mode 100644
index ab1c26b59c5..00000000000
--- a/src/mame/mess.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
-
- mess.cpp
-
- Specific (per target) constants
-
-****************************************************************************/
-
-#include "emu.h"
-
-#define APPNAME "MESS"
-#define APPNAME_LOWER "mess"
-#define CONFIGNAME "mess"
-#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttps://mamedev.org"
-#define COPYRIGHT_INFO "Copyright Nicola Salmoria and the MAME team"
-
-const char * emulator_info::get_appname() { return APPNAME;}
-const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
-const char * emulator_info::get_configname() { return CONFIGNAME;}
-const char * emulator_info::get_copyright() { return COPYRIGHT;}
-const char * emulator_info::get_copyright_info() { return COPYRIGHT_INFO;}