diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/devfind.h | 4 | ||||
| -rw-r--r-- | src/emu/diimage.cpp | 2 | ||||
| -rw-r--r-- | src/emu/diimage.h | 26 | ||||
| -rw-r--r-- | src/emu/dispatch.h | 2 | ||||
| -rw-r--r-- | src/emu/emuopts.h | 4 | ||||
| -rw-r--r-- | src/emu/machine.cpp | 2 | ||||
| -rw-r--r-- | src/emu/machine.h | 2 | ||||
| -rw-r--r-- | src/emu/main.h | 2 | ||||
| -rw-r--r-- | src/emu/mconfig.cpp | 2 | ||||
| -rw-r--r-- | src/emu/rendfont.cpp | 4 | ||||
| -rw-r--r-- | src/emu/rendlay.cpp | 14 | ||||
| -rw-r--r-- | src/emu/romload.cpp | 2 | ||||
| -rw-r--r-- | src/emu/ui/uimain.h | 30 | ||||
| -rw-r--r-- | src/emu/validity.h | 2 |
14 files changed, 49 insertions, 49 deletions
diff --git a/src/emu/devfind.h b/src/emu/devfind.h index 8ea8e59908c..af2626c9797 100644 --- a/src/emu/devfind.h +++ b/src/emu/devfind.h @@ -359,7 +359,7 @@ class optional_region_ptr : public region_ptr_finder<_PointerType, false> { public: optional_region_ptr(device_t &base, const char *tag, size_t length = 0) : region_ptr_finder<_PointerType, false>(base, tag, length) { } - optional_region_ptr(device_t &base, size_t length = 0) : region_ptr_finder<_PointerType, false>(base, FINDER_DUMMY_TAG, length) { } + optional_region_ptr(device_t &base, size_t length = 0) : region_ptr_finder<_PointerType, false>(base, FINDER_DUMMY_TAG, length) { } }; // required region pointer finder @@ -368,7 +368,7 @@ class required_region_ptr : public region_ptr_finder<_PointerType, true> { public: required_region_ptr(device_t &base, const char *tag, size_t length = 0) : region_ptr_finder<_PointerType, true>(base, tag, length) { } - required_region_ptr(device_t &base, size_t length = 0) : region_ptr_finder<_PointerType, true>(base, FINDER_DUMMY_TAG, length) { } + required_region_ptr(device_t &base, size_t length = 0) : region_ptr_finder<_PointerType, true>(base, FINDER_DUMMY_TAG, length) { } }; diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index c1e1e6de409..198be9d1ac0 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -65,7 +65,7 @@ device_image_interface::device_image_interface(const machine_config &mconfig, de m_from_swlist(false), m_create_format(0), m_create_args(nullptr), - m_user_loadable(TRUE), + m_user_loadable(TRUE), m_is_loading(FALSE) { } diff --git a/src/emu/diimage.h b/src/emu/diimage.h index 10b4144e27f..89c402b47fa 100644 --- a/src/emu/diimage.h +++ b/src/emu/diimage.h @@ -129,7 +129,7 @@ typedef void (*device_image_partialhash_func)(hash_collection &, const unsigned #define DEVICE_IMAGE_UNLOAD_DELEGATE(_class,_name) device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_name),#_class "::device_image_unload_" #_name, downcast<_class *>(device->owner())) #define MCFG_SET_IMAGE_LOADABLE(_usrload) \ - device_image_interface::static_set_user_loadable(*device, _usrload); + device_image_interface::static_set_user_loadable(*device, _usrload); // ======================> device_image_interface @@ -237,15 +237,15 @@ public: int reopen_for_write(const char *path); static void software_name_split(const char *swlist_swname, std::string &swlist_name, std::string &swname, std::string &swpart); - static void static_set_user_loadable(device_t &device, bool user_loadable) { - device_image_interface *img; - if (!device.interface(img)) - throw emu_fatalerror("MCFG_SET_IMAGE_LOADABLE called on device '%s' with no image interface\n", device.tag()); - - img->m_user_loadable = user_loadable; - } + static void static_set_user_loadable(device_t &device, bool user_loadable) { + device_image_interface *img; + if (!device.interface(img)) + throw emu_fatalerror("MCFG_SET_IMAGE_LOADABLE called on device '%s' with no image interface\n", device.tag()); - bool user_loadable() const { return m_user_loadable; } + img->m_user_loadable = user_loadable; + } + + bool user_loadable() const { return m_user_loadable; } protected: bool load_internal(const char *path, bool is_create, int create_format, option_resolution *create_args, bool just_load); @@ -318,13 +318,13 @@ protected: std::string m_brief_instance_name; std::string m_instance_name; - + /* creation info */ simple_list<image_device_format> m_formatlist; - /* in the case of arcade cabinet with fixed carts inserted, - we want to disable command line cart loading... */ - bool m_user_loadable; + /* in the case of arcade cabinet with fixed carts inserted, + we want to disable command line cart loading... */ + bool m_user_loadable; bool m_is_loading; }; diff --git a/src/emu/dispatch.h b/src/emu/dispatch.h index fae34197100..dbaaeb32a96 100644 --- a/src/emu/dispatch.h +++ b/src/emu/dispatch.h @@ -33,7 +33,7 @@ template<int N> class devcb_line_dispatch_device : public device_t { public: devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DEVCB_LINE_DISPATCH_2, "DEVCB_LINE_DISPATCH_2", tag, owner, clock, "devcb_line_dispatch_2", __FILE__) { } - + void init_fwd() { for(auto & elem : fwd_cb) elem = new devcb_write_line(*this); diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index 891355a4eeb..a47b1381dbb 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -15,7 +15,7 @@ #include "options.h" -#define OPTION_PRIORITY_CMDLINE OPTION_PRIORITY_HIGH + 1 +#define OPTION_PRIORITY_CMDLINE OPTION_PRIORITY_HIGH + 1 // core options #define OPTION_SYSTEMNAME core_options::unadorned(0) #define OPTION_SOFTWARENAME core_options::unadorned(1) @@ -369,7 +369,7 @@ public: const char *no_plugin() const { return value(OPTION_NO_PLUGIN); } const char *language() const { return value(OPTION_LANGUAGE); } - + // cache frequently used options in members void update_cached_options(); diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 2555cda4c2e..a11afa2ab5b 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -258,7 +258,7 @@ void running_machine::start() m_render->resolve_tags(); manager().create_custom(*this); - + // register callbacks for the devices, then start them add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(running_machine::reset_all_devices), this)); add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(running_machine::stop_all_devices), this)); diff --git a/src/emu/machine.h b/src/emu/machine.h index 9cdc893a2d2..008a350c78d 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -289,7 +289,7 @@ private: std::unique_ptr<input_manager> m_input; // internal data from input.cpp std::unique_ptr<sound_manager> m_sound; // internal data from sound.cpp std::unique_ptr<video_manager> m_video; // internal data from video.cpp - ui_manager *m_ui; // internal data from ui.cpp + ui_manager *m_ui; // internal data from ui.cpp std::unique_ptr<ui_input_manager> m_ui_input; // internal data from uiinput.cpp std::unique_ptr<tilemap_manager> m_tilemap; // internal data from tilemap.cpp std::unique_ptr<debug_view_manager> m_debug_view; // internal data from debugvw.cpp diff --git a/src/emu/main.h b/src/emu/main.h index b8aaf3b838a..1225e5c21a6 100644 --- a/src/emu/main.h +++ b/src/emu/main.h @@ -88,7 +88,7 @@ public: protected: osd_interface & m_osd; // reference to OSD system emu_options & m_options; // reference to options - running_machine * m_machine; + running_machine * m_machine; }; diff --git a/src/emu/mconfig.cpp b/src/emu/mconfig.cpp index 9cd039701cd..17e948f7844 100644 --- a/src/emu/mconfig.cpp +++ b/src/emu/mconfig.cpp @@ -34,7 +34,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options) bool is_selected_driver = core_stricmp(gamedrv.name,options.system_name())==0; // intialize slot devices - make sure that any required devices have been allocated - + for (device_slot_interface &slot : slot_interface_iterator(root_device())) { device_t &owner = slot.device(); diff --git a/src/emu/rendfont.cpp b/src/emu/rendfont.cpp index 70d87856378..9687206f85b 100644 --- a/src/emu/rendfont.cpp +++ b/src/emu/rendfont.cpp @@ -420,11 +420,11 @@ float render_font::string_width(float height, float aspect, const char *string) const char *ends = string + strlen(string); const char *s = string; unicode_char schar; - + // loop over characters while (*s != 0) { - int scharcount = uchar_from_utf8(&schar, s, ends - s); + int scharcount = uchar_from_utf8(&schar, s, ends - s); totwidth += get_char(schar).width; s += scharcount; } diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp index 5b945b09d04..9c9a854e512 100644 --- a/src/emu/rendlay.cpp +++ b/src/emu/rendlay.cpp @@ -950,12 +950,12 @@ void layout_element::component::draw_text(running_machine &machine, bitmap_argb3 const char *ends = origs + strlen(origs); const char *s = origs; unicode_char schar; - + // loop over characters while (*s != 0) { - int scharcount = uchar_from_utf8(&schar, s, ends - s); - + int scharcount = uchar_from_utf8(&schar, s, ends - s); + if (scharcount == -1) break; @@ -1124,8 +1124,8 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 // loop over characters while (*s != 0) { - int scharcount = uchar_from_utf8(&schar, s, ends - s); - + int scharcount = uchar_from_utf8(&schar, s, ends - s); + if (scharcount == -1) break; @@ -1285,8 +1285,8 @@ void layout_element::component::draw_beltreel(running_machine &machine, bitmap_a // loop over characters while (*s != 0) { - int scharcount = uchar_from_utf8(&schar, s, ends - s); - + int scharcount = uchar_from_utf8(&schar, s, ends - s); + if (scharcount == -1) break; diff --git a/src/emu/romload.cpp b/src/emu/romload.cpp index a03e25e91ed..2efc80a4dc5 100644 --- a/src/emu/romload.cpp +++ b/src/emu/romload.cpp @@ -1449,7 +1449,7 @@ rom_load_manager::rom_load_manager(running_machine &machine) : m_machine(machine) { /* figure out which BIOS we are using */ - + for (device_t &device : device_iterator(machine.config().root_device())) { if (device.rom_region()) diff --git a/src/emu/ui/uimain.h b/src/emu/ui/uimain.h index 9230892adca..48fbdff5c18 100644 --- a/src/emu/ui/uimain.h +++ b/src/emu/ui/uimain.h @@ -57,11 +57,11 @@ enum class ui_menu_item_type class ui_menu_item { public: - const char *text; - const char *subtext; - UINT32 flags; - void *ref; - ui_menu_item_type type; // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*) + const char *text; + const char *subtext; + UINT32 flags; + void *ref; + ui_menu_item_type type; // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*) inline bool is_selectable() const; }; @@ -73,27 +73,27 @@ public: ui_manager(running_machine &machine) : m_machine(machine),m_use_natural_keyboard(false),m_show_timecode_counter(false),m_show_timecode_total(false) { } virtual ~ui_manager() { } - + virtual void set_startup_text(const char *text, bool force) { } - + virtual bool is_menu_active() { return false; } - + bool use_natural_keyboard() const { return m_use_natural_keyboard; } - + void set_show_timecode_counter(bool value) { m_show_timecode_counter = value; m_show_timecode_total = true; } bool show_timecode_counter() const { return m_show_timecode_counter; } - bool show_timecode_total() const { return m_show_timecode_total; } - - virtual void popup_time_string(int seconds, std::string message) { } + bool show_timecode_total() const { return m_show_timecode_total; } + + virtual void popup_time_string(int seconds, std::string message) { } virtual void image_display(const device_type &type, device_image_interface *image) { } - + template <typename Format, typename... Params> void popup_time(int seconds, Format &&fmt, Params &&... args); - + protected: // instance variables - running_machine & m_machine; + running_machine & m_machine; bool m_use_natural_keyboard; bool m_show_timecode_counter; bool m_show_timecode_total; diff --git a/src/emu/validity.h b/src/emu/validity.h index eec10069aaa..cca0eda18da 100644 --- a/src/emu/validity.h +++ b/src/emu/validity.h @@ -112,7 +112,7 @@ private: const char * m_current_ioport; int_map m_region_map; std::unordered_set<std::string> m_already_checked; - bool m_validate_all; + bool m_validate_all; }; #endif |
