Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-05 12:26:35 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

misc: remove uneeded \n on image error return string

Browse Source
This commit is contained in:
hap 2023-04-22 16:51:01 +02:00
parent 4cce14ef15
commit 3a34a5b8ba
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mame/apple/apple1.cpp
View File

@ -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());

5
src/mame/handheld/hh_smc1k.cpp
View File

@ -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?

8
src/mame/handheld/hh_tms1k.cpp
View File

@ -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");

4
src/mame/hp/hp48_port.cpp
View File

@ -56,7 +56,7 @@ std::pair<std::error_condition, std::string> 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<std::error_condition, std::string> 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;

2
src/mame/sega/segas32.cpp
View File

@ -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 )