From 3a34a5b8baf63e234ed6aaf518a4335aee0cc210 Mon Sep 17 00:00:00 2001 From: hap Date: Sat, 22 Apr 2023 16:51:01 +0200 Subject: misc: remove uneeded \n on image error return string --- src/mame/apple/apple1.cpp | 4 ++-- src/mame/handheld/hh_smc1k.cpp | 5 +++-- src/mame/handheld/hh_tms1k.cpp | 8 ++++---- src/mame/hp/hp48_port.cpp | 4 ++-- src/mame/sega/segas32.cpp | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/mame/apple/apple1.cpp b/src/mame/apple/apple1.cpp index b810b0a5862..027d7124df5 100644 --- a/src/mame/apple/apple1.cpp +++ b/src/mame/apple/apple1.cpp @@ -194,7 +194,7 @@ SNAPSHOT_LOAD_MEMBER(apple1_state::snapshot_cb) return std::make_pair(image_error::UNSPECIFIED, "Internal error loading snapshot"); if ((memcmp(hd1, &data[0], 5)) || (memcmp(hd2, &data[7], 5))) - return std::make_pair(image_error::INVALIDIMAGE, "Snapshot is invalid\n"); + return std::make_pair(image_error::INVALIDIMAGE, "Snapshot is invalid"); uint16_t start = (data[5]<<8) | data[6]; uint16_t end = (snapsize - 12) + start; @@ -216,7 +216,7 @@ SNAPSHOT_LOAD_MEMBER(apple1_state::snapshot_cb) { return std::make_pair( image_error::INVALIDIMAGE, - util::string_format("Snapshot has invalid load address %04x\n", start)); + util::string_format("Snapshot has invalid load address %04x", start)); } return std::make_pair(std::error_condition(), std::string()); diff --git a/src/mame/handheld/hh_smc1k.cpp b/src/mame/handheld/hh_smc1k.cpp index 16915d722c5..d4a8c43e6d6 100644 --- a/src/mame/handheld/hh_smc1k.cpp +++ b/src/mame/handheld/hh_smc1k.cpp @@ -6,8 +6,9 @@ Suwa Seikosha (S-MOS) SMC11xx handhelds Some LCD games with this MCU, and perhaps early-80s Seiko wristwatches too. -Before Tiger's 78-xxx series (hh_sm510.cpp), they released their games in Europe -through different publishers, eg. Orlitronic in France, Virca in Italy. +In Europe, Tiger didn't release their pre-78-xxx LCD games (hh_sm510.cpp) +themselves, but through different publishers, eg. Orlitronic in France, +Grandstand in the UK, Virca in Italy. TODO: - add common mcfg (like hh_sm510) when more games are added? diff --git a/src/mame/handheld/hh_tms1k.cpp b/src/mame/handheld/hh_tms1k.cpp index 59908a98164..d23ae53bbaa 100644 --- a/src/mame/handheld/hh_tms1k.cpp +++ b/src/mame/handheld/hh_tms1k.cpp @@ -2953,7 +2953,7 @@ DEVICE_IMAGE_LOAD_MEMBER(quizwizc_state::cart_load) m_pinout = bitswap<8>(m_pinout,4,3,7,5,2,1,6,0) << 4; if (m_pinout == 0) - return std::make_pair(image_error::BADSOFTWARE, "Invalid cartridge pinout\n"); + return std::make_pair(image_error::BADSOFTWARE, "Invalid cartridge pinout"); return std::make_pair(std::error_condition(), std::string()); } @@ -3136,7 +3136,7 @@ void tc4_state::machine_start() DEVICE_IMAGE_LOAD_MEMBER(tc4_state::cart_load) { if (!image.loaded_through_softlist()) - return std::make_pair(image_error::UNSUPPORTED, "Can only load through software list\n"); + return std::make_pair(image_error::UNSUPPORTED, "Can only load through software list"); // get cartridge pinout R9 to K connections const char *pinout = image.get_feature("pinout"); @@ -11847,7 +11847,7 @@ static INPUT_PORTS_START( wtalker ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("5") PORT_START("IN.1") // O5 - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("Guest") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("Guest") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("2") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_NAME("1") @@ -14673,7 +14673,7 @@ void playmaker_state::machine_start() DEVICE_IMAGE_LOAD_MEMBER(playmaker_state::cart_load) { if (!image.loaded_through_softlist()) - return std::make_pair(image_error::UNSUPPORTED, "Can only load through software list\n"); + return std::make_pair(image_error::UNSUPPORTED, "Can only load through software list"); // get cartridge notch const char *notch = image.get_feature("notch"); diff --git a/src/mame/hp/hp48_port.cpp b/src/mame/hp/hp48_port.cpp index e434705c222..38d3d6e0f70 100644 --- a/src/mame/hp/hp48_port.cpp +++ b/src/mame/hp/hp48_port.cpp @@ -56,7 +56,7 @@ std::pair hp48_port_image_device::call_load() { return std::make_pair( image_error::INVALIDLENGTH, - util::string_format("Image size must be a power of two between %i and %i\n", 32*1024, m_max_size)); + util::string_format("Image size must be a power of two between %i and %i", 32*1024, m_max_size)); } m_port_size = size; @@ -79,7 +79,7 @@ std::pair hp48_port_image_device::call_create { return std::make_pair( image_error::INVALIDLENGTH, - util::string_format("Image size must be a power of two between %i and %i\n", 32*1024, m_max_size)); + util::string_format("Image size must be a power of two between %i and %i", 32*1024, m_max_size)); } m_port_size = size; diff --git a/src/mame/sega/segas32.cpp b/src/mame/sega/segas32.cpp index 3cd1a11b939..68b69fd1baf 100644 --- a/src/mame/sega/segas32.cpp +++ b/src/mame/sega/segas32.cpp @@ -5974,7 +5974,7 @@ GAME( 1992, brivalj, brival, sega_system32_4p, brival, segas32_ne GAME( 1992, darkedge, 0, sega_system32_4p, darkedge, segas32_new_state, init_darkedge, ROT0, "Sega", "Dark Edge (World)", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1992, darkedgej, darkedge, sega_system32_4p, darkedge, segas32_new_state, init_darkedge, ROT0, "Sega", "Dark Edge (Japan)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1994, dbzvrvs, 0, sega_system32_analog, dbzvrvs, segas32_new_state, init_dbzvrvs, ROT0, "Sega / Banpresto", "Dragon Ball Z V.R.V.S. (Japan, Rev A)", MACHINE_IMPERFECT_GRAPHICS) +GAME( 1994, dbzvrvs, 0, sega_system32_analog, dbzvrvs, segas32_new_state, init_dbzvrvs, ROT0, "Sega / Banpresto", "Dragon Ball Z: V.R. V.S. (Japan, Rev A)", MACHINE_IMPERFECT_GRAPHICS) GAME( 1991, f1en, 0, sega_system32_dual_direct, f1en, segas32_new_state, init_f1en, ROT0, "Sega", "F1 Exhaust Note (World, Rev A)", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1991, f1enu, f1en, sega_system32_dual_direct, f1en, segas32_new_state, init_f1en, ROT0, "Sega", "F1 Exhaust Note (US, Rev A)", MACHINE_IMPERFECT_GRAPHICS ) -- cgit v1.2.3