* (at your option):\r
* - GNU GPL, version 2 or later.\r
* - GNU LGPL, version 2.1 or later.\r
+ * - MAME license.\r
* See the COPYING file in the top-level directory.\r
*/\r
\r
#endif\r
\r
static unsigned char *menu_font_data = NULL;\r
-static int menu_text_color = 0xffff; // default to white\r
+static int menu_text_color = 0xfffe; // default to white\r
static int menu_sel_color = -1; // disabled\r
\r
/* note: these might become non-constant in future */\r
for (x = xmin + 1; x < xmax; x++)\r
{\r
unsigned int p = screen[ls + x];\r
- if (p != 0xffff)\r
+ if (p != menu_text_color)\r
screen[ls + x] = ((p&0xf79e)>>1) - ((p&0xc618)>>3);\r
}\r
screen[ls + xmax] = 0xffff;\r
y += me_mfont_h;\r
}\r
\r
+ menu_separation();\r
+\r
/* display help or message if we have one */\r
h = (g_menuscreen_h - h) / 2; // bottom area height\r
if (menu_error_msg[0] != 0) {\r
if (dev_id < 0)\r
dev_name = "(all devices)";\r
else\r
- dev_name = in_get_dev_name(dev_id, 1, 1);\r
+ dev_name = in_get_dev_name(dev_id, 0, 1);\r
w = strlen(dev_name) * me_mfont_w;\r
if (w < 30 * me_mfont_w)\r
w = 30 * me_mfont_w;\r
for (i = 0, dev_id--; i < IN_MAX_DEVS + 1; i++, dev_id--) {\r
if (dev_id < -1)\r
dev_id = IN_MAX_DEVS - 1;\r
- if (dev_id == -1 || in_get_dev_name(dev_id, 1, 0) != NULL)\r
+ if (dev_id == -1 || in_get_dev_name(dev_id, 0, 0) != NULL)\r
break;\r
}\r
continue;\r
for (i = 0, dev_id++; i < IN_MAX_DEVS; i++, dev_id++) {\r
if (dev_id >= IN_MAX_DEVS)\r
dev_id = -1;\r
- if (dev_id == -1 || in_get_dev_name(dev_id, 1, 0) != NULL)\r
+ if (dev_id == -1 || in_get_dev_name(dev_id, 0, 0) != NULL)\r
break;\r
}\r
continue;\r