diff options
author | Vas Crabb <vas@vastheman.com> | 2019-09-20 00:28:19 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-09-20 00:28:19 +1000 |
commit | dac7094f3431b8f933497b0c7693e6baeb1bb75c (patch) | |
tree | 1c3dc049110c54d23dc31a1e6c1e8b11fd24e299 /src/emu | |
parent | cc25024f791747fa17c1f06bd81c482a86aac91b (diff) |
(nw) misc cleanup:
* get rid of most assert_always
* get rid of a few MCFG_*_OVERRIDE
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/diimage.cpp | 9 | ||||
-rw-r--r-- | src/emu/diimage.h | 2 | ||||
-rw-r--r-- | src/emu/dipalette.cpp | 3 | ||||
-rw-r--r-- | src/emu/tilemap.cpp | 3 | ||||
-rw-r--r-- | src/emu/tilemap.h | 4 |
5 files changed, 13 insertions, 8 deletions
diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index 69417db74db..cdbcbb1edf4 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -625,7 +625,8 @@ bool device_image_interface::support_command_line_image_creation() const void device_image_interface::battery_load(void *buffer, int length, int fill) { - assert_always(buffer && (length > 0), "Must specify sensical buffer/length"); + if (!buffer || (length <= 0)) + throw emu_fatalerror("device_image_interface::battery_load: Must specify sensical buffer/length"); osd_file::error filerr; int bytes_read = 0; @@ -643,7 +644,8 @@ void device_image_interface::battery_load(void *buffer, int length, int fill) void device_image_interface::battery_load(void *buffer, int length, void *def_buffer) { - assert_always(buffer && (length > 0), "Must specify sensical buffer/length"); + if (!buffer || (length <= 0)) + throw emu_fatalerror("device_image_interface::battery_load: Must specify sensical buffer/length"); osd_file::error filerr; int bytes_read = 0; @@ -670,7 +672,8 @@ void device_image_interface::battery_load(void *buffer, int length, void *def_bu void device_image_interface::battery_save(const void *buffer, int length) { - assert_always(buffer && (length > 0), "Must specify sensical buffer/length"); + if (!buffer || (length <= 0)) + throw emu_fatalerror("device_image_interface::battery_save: Must specify sensical buffer/length"); if (!device().machine().options().nvram_save()) return; diff --git a/src/emu/diimage.h b/src/emu/diimage.h index fb2a317d60a..4a3ed06d6cc 100644 --- a/src/emu/diimage.h +++ b/src/emu/diimage.h @@ -243,7 +243,7 @@ protected: void clear_error(); - void check_for_file() const { assert_always(m_file, "Illegal operation on unmounted image"); } + void check_for_file() const { if (!m_file) throw emu_fatalerror("%s(%s): Illegal operation on unmounted image", device().shortname(), device().tag()); } void setup_working_directory(); bool try_change_working_directory(const std::string &subdir); diff --git a/src/emu/dipalette.cpp b/src/emu/dipalette.cpp index 76c0c0f1c82..b5ceeb05d4c 100644 --- a/src/emu/dipalette.cpp +++ b/src/emu/dipalette.cpp @@ -345,7 +345,8 @@ void device_palette_interface::allocate_palette(u32 numentries) m_shadow_group = numgroups++; if (palette_hilights_enabled()) m_hilight_group = numgroups++; - assert_always(numentries * numgroups <= 65536, "Palette has more than 65536 colors."); + if (numentries * numgroups > 65536) + throw emu_fatalerror("%s(%s): Palette has more than 65536 colors.", device().shortname(), device().tag()); // allocate a palette object containing all the colors and groups m_palette = palette_t::alloc(numentries, numgroups); diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp index df63d06c5c8..1e56fa84d20 100644 --- a/src/emu/tilemap.cpp +++ b/src/emu/tilemap.cpp @@ -9,9 +9,10 @@ ***************************************************************************/ #include "emu.h" -#include "screen.h" #include "tilemap.h" +#include "screen.h" + //************************************************************************** // INLINE FUNCTIONS diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index 185311c389a..a116f019c6c 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -298,11 +298,11 @@ ***************************************************************************/ -#pragma once - #ifndef MAME_EMU_TILEMAP_H #define MAME_EMU_TILEMAP_H +#pragma once + //************************************************************************** // CONSTANTS |