diff options
author | 2016-03-20 17:09:13 +0100 | |
---|---|---|
committer | 2016-03-20 17:09:13 +0100 | |
commit | 17eccd74d748d6656e360dd960223fd79ed090ea (patch) | |
tree | b8a7aea979e93426325dda5d16794f2a6936e06c | |
parent | 3f86b60153c3c8ce55455b71983fd6bf000bc53e (diff) |
removed double string in some instances of "Fatal error: Error: x"
-rw-r--r-- | src/devices/bus/isa/isa.cpp | 2 | ||||
-rw-r--r-- | src/devices/video/tms9927.cpp | 2 | ||||
-rw-r--r-- | src/emu/machine.cpp | 4 | ||||
-rw-r--r-- | src/emu/memory.cpp | 4 | ||||
-rw-r--r-- | src/emu/sound.cpp | 4 | ||||
-rw-r--r-- | src/mame/drivers/namcos21.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/ngen.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/atarirle.cpp | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 0d8f0c777e1..9b07bdce8e0 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -54,7 +54,7 @@ void isa8_slot_device::device_start() device_isa8_card_interface *dev = dynamic_cast<device_isa8_card_interface *>(get_card_device()); const device_isa16_card_interface *intf; if (get_card_device()->interface(intf)) - fatalerror("Error ISA16 device in ISA8 slot\n"); + fatalerror("ISA16 device in ISA8 slot\n"); if (dev) device_isa8_card_interface::static_set_isabus(*dev,m_owner->subdevice(m_isa_tag)); } diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp index 5a9a0b3e960..9c45dab00ca 100644 --- a/src/devices/video/tms9927.cpp +++ b/src/devices/video/tms9927.cpp @@ -79,7 +79,7 @@ crt5057_device::crt5057_device(const machine_config &mconfig, const char *tag, d void tms9927_device::device_start() { assert(clock() > 0); - if (!(m_hpixels_per_column > 0)) fatalerror("ERROR: TMS9927: number of pixels per column must be explicitly set using MCFG_TMS9927_CHAR_WIDTH()!\n"); + if (!(m_hpixels_per_column > 0)) fatalerror("TMS9927: number of pixels per column must be explicitly set using MCFG_TMS9927_CHAR_WIDTH()!\n"); /* copy the initial parameters */ m_clock = clock(); diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index aab6f017d4c..7c465be0cd8 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -372,7 +372,7 @@ int running_machine::run(bool firstrun) g_profiler.start(PROFILER_EXTRA); #if defined(EMSCRIPTEN) - //break out to our async javascript loop and halt + // break out to our async javascript loop and halt js_set_main_loop(this); #endif @@ -403,7 +403,7 @@ int running_machine::run(bool firstrun) } catch (emu_fatalerror &fatal) { - osd_printf_error("FATALERROR: %s\n", fatal.string()); + osd_printf_error("Fatal error: %s\n", fatal.string()); error = MAMERR_FATALERROR; if (fatal.exitcode() != 0) error = fatal.exitcode(); diff --git a/src/emu/memory.cpp b/src/emu/memory.cpp index 4401cc0d05e..59d1f6d69e2 100644 --- a/src/emu/memory.cpp +++ b/src/emu/memory.cpp @@ -1890,11 +1890,11 @@ void address_space::prepare_map() // find the region memory_region *region = machine().root_device().memregion(fulltag.c_str()); if (region == nullptr) - fatalerror("Error: device '%s' %s space memory map entry %X-%X references non-existant region \"%s\"\n", m_device.tag(), m_name, entry->m_addrstart, entry->m_addrend, entry->m_region); + fatalerror("device '%s' %s space memory map entry %X-%X references non-existant region \"%s\"\n", m_device.tag(), m_name, entry->m_addrstart, entry->m_addrend, entry->m_region); // validate the region if (entry->m_rgnoffs + (entry->m_byteend - entry->m_bytestart + 1) > region->bytes()) - fatalerror("Error: device '%s' %s space memory map entry %X-%X extends beyond region \"%s\" size (%X)\n", m_device.tag(), m_name, entry->m_addrstart, entry->m_addrend, entry->m_region, region->bytes()); + fatalerror("device '%s' %s space memory map entry %X-%X extends beyond region \"%s\" size (%X)\n", m_device.tag(), m_name, entry->m_addrstart, entry->m_addrend, entry->m_region, region->bytes()); } // convert any region-relative entries to their memory pointers diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index 288bb09d9dc..47e7dcc90e8 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -231,11 +231,11 @@ void sound_stream::set_input(int index, sound_stream *input_stream, int output_i // make sure it's a valid input if (index >= m_input.size()) - fatalerror("Fatal error: stream_set_input attempted to configure non-existant input %d (%d max)\n", index, int(m_input.size())); + fatalerror("stream_set_input attempted to configure non-existant input %d (%d max)\n", index, int(m_input.size())); // make sure it's a valid output if (input_stream != nullptr && output_index >= input_stream->m_output.size()) - fatalerror("Fatal error: stream_set_input attempted to use a non-existant output %d (%d max)\n", output_index, int(m_output.size())); + fatalerror("stream_set_input attempted to use a non-existant output %d (%d max)\n", output_index, int(m_output.size())); // if this input is already wired, update the dependent info stream_input &input = m_input[index]; diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp index 4a9b4f51038..e8b629340da 100644 --- a/src/mame/drivers/namcos21.cpp +++ b/src/mame/drivers/namcos21.cpp @@ -1004,7 +1004,7 @@ void namcos21_state::render_slave_output(UINT16 data) { if( m_mpDspState->slaveOutputSize >= 4096 ) { - fatalerror( "FATAL ERROR: SLAVE OVERFLOW (0x%x)\n",m_mpDspState->slaveOutputBuffer[0] ); + fatalerror( "SLAVE OVERFLOW (0x%x)\n",m_mpDspState->slaveOutputBuffer[0] ); } /* append word to slave output buffer */ diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp index fc02d654308..388ad075d74 100644 --- a/src/mame/drivers/ngen.cpp +++ b/src/mame/drivers/ngen.cpp @@ -834,7 +834,7 @@ void ngen_state::machine_start() memory_share* fontshare = memshare("fontram"); m_hd_buffer.allocate(1024*8); // 8kB buffer RAM for HD controller if(vidshare == nullptr || fontshare == nullptr) - fatalerror("Error: VRAM not found"); + fatalerror("VRAM not found\n"); m_vram.set(*vidshare,2); m_fontram.set(*fontshare,2); } diff --git a/src/mame/video/atarirle.cpp b/src/mame/video/atarirle.cpp index 6a433d4666c..05a3fe4737d 100644 --- a/src/mame/video/atarirle.cpp +++ b/src/mame/video/atarirle.cpp @@ -191,7 +191,7 @@ void atari_rle_objects_device::device_start() // resolve our memory memory_share *share = owner()->memshare(tag()); if (share == nullptr) - throw emu_fatalerror("Error: unable to find memory share '%s' needed for Atari RLE device", tag()); + throw emu_fatalerror("Unable to find memory share '%s' needed for Atari RLE device", tag()); m_ram.set(*share, 2); // register a VBLANK callback |