From e3d8cb0883370eb3408432a261c634013a0e391d Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 29 Oct 2021 14:33:45 +0200 Subject: selmenu: fix wrongly placed messagebox --- src/devices/bus/isa/p1_sound.cpp | 2 +- src/devices/bus/isa/p1_sound.h | 2 +- src/devices/video/pwm.cpp | 2 +- src/frontend/mame/ui/selmenu.cpp | 11 ++++++----- src/mame/drivers/fanucspmg.cpp | 1 - src/mame/mame.cpp | 2 +- src/mame/mess.cpp | 2 +- src/tools/testkeys.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp index 2c0700d6282..ff4ff515ee4 100644 --- a/src/devices/bus/isa/p1_sound.cpp +++ b/src/devices/bus/isa/p1_sound.cpp @@ -7,7 +7,7 @@ Memory-mapped, uses IRQ3 and IRQ7, no DMA. Copyright MESS Team. - Visit http://mamedev.org for licensing and usage restrictions. + Visit https://mamedev.org for licensing and usage restrictions. **********************************************************************/ diff --git a/src/devices/bus/isa/p1_sound.h b/src/devices/bus/isa/p1_sound.h index e4fee35d2f3..71e4008ccfd 100644 --- a/src/devices/bus/isa/p1_sound.h +++ b/src/devices/bus/isa/p1_sound.h @@ -5,7 +5,7 @@ Poisk-1 sound card Copyright MESS Team. - Visit http://mamedev.org for licensing and usage restrictions. + Visit https://mamedev.org for licensing and usage restrictions. **********************************************************************/ diff --git a/src/devices/video/pwm.cpp b/src/devices/video/pwm.cpp index 64943c6c7ae..4cb6290e3fe 100644 --- a/src/devices/video/pwm.cpp +++ b/src/devices/video/pwm.cpp @@ -27,7 +27,7 @@ levels of brightness by strobing elements longer. TODO: -- multiple brightness levels doesn't work for SVGs +- SVG screens and rendlay digit elements don't support multiple brightness levels */ diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp index f7be0bf5279..2228f7b1b60 100644 --- a/src/frontend/mame/ui/selmenu.cpp +++ b/src/frontend/mame/ui/selmenu.cpp @@ -749,12 +749,13 @@ void menu_select_launch::custom_render(void *selectedref, float top, float botto else { std::string copyright(emulator_info::get_copyright()); - size_t found = copyright.find('\n'); + size_t found1 = copyright.find_first_of('\n'); + size_t found2 = copyright.find_last_of('\n'); - tempbuf[0].clear(); - tempbuf[1] = string_format(_("%1$s %2$s"), emulator_info::get_appname(), build_version); - tempbuf[2] = copyright.substr(0, found); - tempbuf[3] = copyright.substr(found + 1); + tempbuf[0] = string_format(_("%1$s %2$s"), emulator_info::get_appname(), build_version); + tempbuf[1] = copyright.substr(0, found1); + tempbuf[2] = copyright.substr(found1 + 1, found2 - (found1 + 1)); + tempbuf[3] = copyright.substr(found2 + 1); } // draw the footer diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp index 7baf4ddfb32..99439afbea5 100644 --- a/src/mame/drivers/fanucspmg.cpp +++ b/src/mame/drivers/fanucspmg.cpp @@ -112,7 +112,6 @@ Note: To initiate booting from the floppy drive hold down the LOAD key for 3-5 s The software for the Fanuc System P-Model G is extremely rare now and very difficult to find. If you do have any of these wanted software titles or any manuals listed below and want to help -please contact me (Guru) via http://mamedev.org/contact.html The following is a complete list of manuals available for the first edition of the Fanuc System P-Model G released in 1983. The info is taken from a glossy sales brochure diff --git a/src/mame/mame.cpp b/src/mame/mame.cpp index d40869d53fe..217651fd510 100644 --- a/src/mame/mame.cpp +++ b/src/mame/mame.cpp @@ -13,7 +13,7 @@ #define APPNAME "MAME" #define APPNAME_LOWER "mame" #define CONFIGNAME "mame" -#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttp://mamedev.org" +#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;} diff --git a/src/mame/mess.cpp b/src/mame/mess.cpp index 06e49420e3b..ab1c26b59c5 100644 --- a/src/mame/mess.cpp +++ b/src/mame/mess.cpp @@ -13,7 +13,7 @@ #define APPNAME "MESS" #define APPNAME_LOWER "mess" #define CONFIGNAME "mess" -#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttp://mamedev.org" +#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;} diff --git a/src/tools/testkeys.cpp b/src/tools/testkeys.cpp index c963f948a67..8e262733302 100644 --- a/src/tools/testkeys.cpp +++ b/src/tools/testkeys.cpp @@ -3,7 +3,7 @@ // testkeys.cpp - A small utility to analyze SDL keycodes // // Copyright (c) 1996-2021, Nicola Salmoria and the MAME Team. -// Visit http://mamedev.org for licensing and usage restrictions. +// Visit https://mamedev.org for licensing and usage restrictions. // // SDLMAME by Olivier Galibert and R. Belmont // testkeys by couriersud -- cgit v1.2.3