diff options
| author | 2015-11-25 08:22:24 +0100 | |
|---|---|---|
| committer | 2015-11-25 08:22:24 +0100 | |
| commit | 0825ce4f3b8eaab42e3682f7d01d97ce6ea0416d (patch) | |
| tree | 24de29ca8cbba68740ec8cd26f15209f19c2bf0b /src/emu | |
| parent | d1d8a66ab196156ab22ba1059d714cd040b44ab6 (diff) | |
Cleanups and version bumpmame0168
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/addrmap.cpp | 4 | ||||
| -rw-r--r-- | src/emu/devcb.cpp | 8 | ||||
| -rw-r--r-- | src/emu/device.cpp | 1 | ||||
| -rw-r--r-- | src/emu/diexec.cpp | 2 | ||||
| -rw-r--r-- | src/emu/digfx.cpp | 2 | ||||
| -rw-r--r-- | src/emu/diimage.cpp | 14 | ||||
| -rw-r--r-- | src/emu/diserial.cpp | 6 | ||||
| -rw-r--r-- | src/emu/dislot.cpp | 4 | ||||
| -rw-r--r-- | src/emu/drivers/testcpu.cpp | 2 | ||||
| -rw-r--r-- | src/emu/emupal.cpp | 10 | ||||
| -rw-r--r-- | src/emu/ioport.cpp | 10 | ||||
| -rw-r--r-- | src/emu/luaengine.cpp | 6 | ||||
| -rw-r--r-- | src/emu/memory.cpp | 12 | ||||
| -rw-r--r-- | src/emu/render.h | 12 | ||||
| -rw-r--r-- | src/emu/screen.cpp | 4 | ||||
| -rw-r--r-- | src/emu/screen.h | 2 | ||||
| -rw-r--r-- | src/emu/softlist.cpp | 2 | ||||
| -rw-r--r-- | src/emu/sound.cpp | 6 | ||||
| -rw-r--r-- | src/emu/sprite.h | 2 | ||||
| -rw-r--r-- | src/emu/tilemap.cpp | 4 | ||||
| -rw-r--r-- | src/emu/ui/filesel.cpp | 4 | ||||
| -rw-r--r-- | src/emu/ui/imgcntrl.cpp | 8 | ||||
| -rw-r--r-- | src/emu/validity.cpp | 2 | ||||
| -rw-r--r-- | src/emu/video/vector.cpp | 2 |
24 files changed, 64 insertions, 65 deletions
diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp index f989f43dc4a..0179dc0e7ac 100644 --- a/src/emu/addrmap.cpp +++ b/src/emu/addrmap.cpp @@ -29,8 +29,8 @@ address_map_entry::address_map_entry(device_t &device, address_map &map, offs_t m_addrmask(0), m_share(NULL), m_region(NULL), - m_rgnoffs(0), - m_submap_bits(0), + m_rgnoffs(0), + m_submap_bits(0), m_memory(NULL), m_bytestart(0), m_byteend(0), diff --git a/src/emu/devcb.cpp b/src/emu/devcb.cpp index aa69ce9e7d1..8a05625aabd 100644 --- a/src/emu/devcb.cpp +++ b/src/emu/devcb.cpp @@ -108,8 +108,8 @@ void devcb_base::resolve_space() //------------------------------------------------- devcb_read_base::devcb_read_base(device_t &device, UINT64 defmask) - : devcb_base(device, defmask), - m_adapter(NULL) + : devcb_base(device, defmask), + m_adapter(NULL) { } @@ -336,8 +336,8 @@ UINT64 devcb_read_base::read_constant_adapter(address_space &space, offs_t offse //------------------------------------------------- devcb_write_base::devcb_write_base(device_t &device, UINT64 defmask) - : devcb_base(device, defmask), - m_adapter(NULL) + : devcb_base(device, defmask), + m_adapter(NULL) { } diff --git a/src/emu/device.cpp b/src/emu/device.cpp index c6c29d7af4a..2e8a56d9101 100644 --- a/src/emu/device.cpp +++ b/src/emu/device.cpp @@ -1003,4 +1003,3 @@ void device_interface::interface_debug_setup() { // do nothing by default } - diff --git a/src/emu/diexec.cpp b/src/emu/diexec.cpp index f1f1528f826..1e9e6d487a9 100644 --- a/src/emu/diexec.cpp +++ b/src/emu/diexec.cpp @@ -615,7 +615,7 @@ int device_execute_interface::standard_irq_callback(int irqline) { // get the default vector and acknowledge the interrupt if needed int vector = m_input[irqline].default_irq_callback(); - + if (VERBOSE) device().logerror("standard_irq_callback('%s', %d) $%04x\n", device().tag(), irqline, vector); // if there's a driver callback, run it to get the vector diff --git a/src/emu/digfx.cpp b/src/emu/digfx.cpp index 933dd5a72c5..d21a3ea0158 100644 --- a/src/emu/digfx.cpp +++ b/src/emu/digfx.cpp @@ -22,7 +22,7 @@ device_gfx_interface::device_gfx_interface(const machine_config &mconfig, device_t &device, const gfx_decode_entry *gfxinfo, const char *palette_tag) - : device_interface(device, "gfx"), + : device_interface(device, "gfx"), m_palette(NULL), m_gfxdecodeinfo(gfxinfo), m_palette_tag(palette_tag), diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index 87a6b10797b..57a73dc66a8 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -59,14 +59,14 @@ device_image_interface::device_image_interface(const machine_config &mconfig, de m_file(NULL), m_mame_file(NULL), m_software_info_ptr(NULL), - m_software_part_ptr(NULL), - m_supported(0), + m_software_part_ptr(NULL), + m_supported(0), m_readonly(false), - m_created(false), - m_init_phase(false), - m_from_swlist(false), - m_create_format(0), - m_create_args(NULL), + m_created(false), + m_init_phase(false), + m_from_swlist(false), + m_create_format(0), + m_create_args(NULL), m_is_loading(FALSE) { } diff --git a/src/emu/diserial.cpp b/src/emu/diserial.cpp index 9fce5064a90..3b679b47232 100644 --- a/src/emu/diserial.cpp +++ b/src/emu/diserial.cpp @@ -19,13 +19,13 @@ device_serial_interface::device_serial_interface(const machine_config &mconfig, m_rcv_register_data(0x8000), m_rcv_flags(0), m_rcv_bit_count_received(0), - m_rcv_bit_count(0), + m_rcv_bit_count(0), m_rcv_byte_received(0), m_rcv_framing_error(false), m_rcv_parity_error(false), m_tra_register_data(0), - m_tra_flags(TRANSMIT_REGISTER_EMPTY), - m_tra_bit_count_transmitted(0), + m_tra_flags(TRANSMIT_REGISTER_EMPTY), + m_tra_bit_count_transmitted(0), m_tra_bit_count(0), m_rcv_clock(NULL), m_tra_clock(NULL), diff --git a/src/emu/dislot.cpp b/src/emu/dislot.cpp index 7a6d2471d6e..304a6517a42 100644 --- a/src/emu/dislot.cpp +++ b/src/emu/dislot.cpp @@ -20,9 +20,9 @@ device_slot_interface::~device_slot_interface() { } -device_slot_option::device_slot_option(const char *name, const device_type &devtype): +device_slot_option::device_slot_option(const char *name, const device_type &devtype): m_next(NULL), - m_name(name), + m_name(name), m_devtype(devtype), m_selectable(true), m_default_bios(NULL), diff --git a/src/emu/drivers/testcpu.cpp b/src/emu/drivers/testcpu.cpp index 04260578fc2..4ee9e30271c 100644 --- a/src/emu/drivers/testcpu.cpp +++ b/src/emu/drivers/testcpu.cpp @@ -32,7 +32,7 @@ public: testcpu_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu(*this, "maincpu"), - m_ram(*this, "ram"), + m_ram(*this, "ram"), m_space(NULL) { } diff --git a/src/emu/emupal.cpp b/src/emu/emupal.cpp index a7673d12447..53841d93581 100644 --- a/src/emu/emupal.cpp +++ b/src/emu/emupal.cpp @@ -24,19 +24,19 @@ palette_device::palette_device(const machine_config &mconfig, const char *tag, d m_entries(0), m_indirect_entries(0), m_enable_shadows(0), - m_enable_hilights(0), + m_enable_hilights(0), m_membits(0), - m_membits_supplied(false), + m_membits_supplied(false), m_endianness(), m_endianness_supplied(false), m_raw_to_rgb(raw_to_rgb_converter()), m_palette(NULL), - m_pens(NULL), + m_pens(NULL), m_format(), m_shadow_table(NULL), m_shadow_group(0), - m_hilight_group(0), - m_white_pen(0), + m_hilight_group(0), + m_white_pen(0), m_black_pen(0), m_init(palette_init_delegate()) { diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp index 50b27db4779..ac2f9436773 100644 --- a/src/emu/ioport.cpp +++ b/src/emu/ioport.cpp @@ -726,7 +726,7 @@ void input_type_entry::restore_default_seq() //------------------------------------------------- digital_joystick::digital_joystick(int player, int number) - : m_next(NULL), + : m_next(NULL), m_player(player), m_number(number), m_current(0), @@ -2454,10 +2454,10 @@ ioport_manager::ioport_manager(running_machine &machine) m_record_file(machine.options().input_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS), m_playback_file(machine.options().input_directory(), OPEN_FLAG_READ), m_playback_accumulated_speed(0), - m_playback_accumulated_frames(0), - m_has_configs(false), - m_has_analog(false), - m_has_dips(false), + m_playback_accumulated_frames(0), + m_has_configs(false), + m_has_analog(false), + m_has_dips(false), m_has_bioses(false) { memset(m_type_to_entry, 0, sizeof(m_type_to_entry)); diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp index e7f00e60126..867e5fa992c 100644 --- a/src/emu/luaengine.cpp +++ b/src/emu/luaengine.cpp @@ -863,9 +863,9 @@ void lua_engine::serve_lua() /* static void *serve_lua(void *param) { - lua_engine *engine = (lua_engine *)param; - engine->serve_lua(); - return NULL; + lua_engine *engine = (lua_engine *)param; + engine->serve_lua(); + return NULL; } */ diff --git a/src/emu/memory.cpp b/src/emu/memory.cpp index c9767bcd592..c0596496fea 100644 --- a/src/emu/memory.cpp +++ b/src/emu/memory.cpp @@ -335,8 +335,8 @@ public: // construction/destruction handler_entry_read(UINT8 width, endianness_t endianness, UINT8 **rambaseptr) - : handler_entry(width, endianness, rambaseptr), - m_ioport(NULL) + : handler_entry(width, endianness, rambaseptr), + m_ioport(NULL) { } @@ -398,8 +398,8 @@ public: // construction/destruction handler_entry_write(UINT8 width, endianness_t endianness, UINT8 **rambaseptr) - : handler_entry(width, endianness, rambaseptr), - m_ioport(NULL) + : handler_entry(width, endianness, rambaseptr), + m_ioport(NULL) { } @@ -4081,8 +4081,8 @@ handler_entry::handler_entry(UINT8 width, endianness_t endianness, UINT8 **ramba m_byteend(0), m_bytemask(~0), m_rambaseptr(rambaseptr), - m_subunits(0), - m_invsubmask(0) + m_subunits(0), + m_invsubmask(0) { } diff --git a/src/emu/render.h b/src/emu/render.h index b33ba92a8c1..7f3f87b8a7d 100644 --- a/src/emu/render.h +++ b/src/emu/render.h @@ -304,11 +304,11 @@ class render_primitive friend class simple_list<render_primitive>; public: - render_primitive(): - type(), - flags(0), - width(0), - container(NULL), + render_primitive(): + type(), + flags(0), + width(0), + container(NULL), m_next(NULL) {} @@ -998,7 +998,7 @@ private: INT32 m_clear_extent_count; // number of clear extents INT32 m_clear_extents[MAX_CLEAR_EXTENTS]; // array of clear extents bool m_transform_primitives; // determines if the primitives shall be scaled/offset by screen settings, - // otherwise the respective render API will handle it (default is true) + // otherwise the respective render API will handle it (default is true) static render_screen_list s_empty_screen_list; }; diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp index fb6fcbc1b57..84b343bdc81 100644 --- a/src/emu/screen.cpp +++ b/src/emu/screen.cpp @@ -58,8 +58,8 @@ screen_device::screen_device(const machine_config &mconfig, const char *tag, dev m_container(NULL), m_width(100), m_height(100), - m_visarea(0, 99, 0, 99), - m_texformat(), + m_visarea(0, 99, 0, 99), + m_texformat(), m_curbitmap(0), m_curtexture(0), m_changed(true), diff --git a/src/emu/screen.h b/src/emu/screen.h index b723a3589ac..0a12c92f6b3 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -228,7 +228,7 @@ public: // additional helpers void register_vblank_callback(vblank_state_delegate vblank_callback); void register_screen_bitmap(bitmap_t &bitmap); - + // internal to the video system bool update_quads(); void update_burnin(); diff --git a/src/emu/softlist.cpp b/src/emu/softlist.cpp index a8cdbb0f19f..ce0aee13a92 100644 --- a/src/emu/softlist.cpp +++ b/src/emu/softlist.cpp @@ -278,7 +278,7 @@ software_list_device::software_list_device(const machine_config &mconfig, const m_list_type(SOFTWARE_LIST_ORIGINAL_SYSTEM), m_filter(NULL), m_parsed(false), - m_file(mconfig.options().hash_path(), OPEN_FLAG_READ), + m_file(mconfig.options().hash_path(), OPEN_FLAG_READ), m_description(NULL) { } diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index 980e552f0b0..f24fb56980b 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -791,9 +791,9 @@ sound_stream::stream_input::stream_input() //------------------------------------------------- sound_stream::stream_output::stream_output() - : m_stream(NULL), - m_dependents(0), - m_gain(0x100) + : m_stream(NULL), + m_dependents(0), + m_gain(0x100) { } diff --git a/src/emu/sprite.h b/src/emu/sprite.h index 44a57606864..b61f5e07f3b 100644 --- a/src/emu/sprite.h +++ b/src/emu/sprite.h @@ -20,7 +20,7 @@ // class representing a single dirty region class sparse_dirty_rect : public rectangle -{ +{ friend class simple_list<sparse_dirty_rect>; public: diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp index 29af574443a..43be2252666 100644 --- a/src/emu/tilemap.cpp +++ b/src/emu/tilemap.cpp @@ -1589,8 +1589,8 @@ const device_type TILEMAP = &device_creator<tilemap_device>; tilemap_device::tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TILEMAP, "Tilemap", tag, owner, clock, "tilemap", __FILE__), m_gfxdecode(*this), - m_standard_mapper(TILEMAP_STANDARD_COUNT), - m_bytes_per_entry(0), + m_standard_mapper(TILEMAP_STANDARD_COUNT), + m_bytes_per_entry(0), m_tile_width(8), m_tile_height(8), m_num_columns(64), diff --git a/src/emu/ui/filesel.cpp b/src/emu/ui/filesel.cpp index 78193f49399..02b0f89e295 100644 --- a/src/emu/ui/filesel.cpp +++ b/src/emu/ui/filesel.cpp @@ -218,7 +218,7 @@ static int is_valid_filename_char(unicode_char unichar) ui_menu_file_create::ui_menu_file_create(running_machine &machine, render_container *container, device_image_interface *image, std::string ¤t_directory, std::string ¤t_file, bool *ok) : ui_menu(machine, container), m_current_directory(current_directory), - m_current_file(current_file), + m_current_file(current_file), m_current_format(NULL) { m_image = image; @@ -344,7 +344,7 @@ void ui_menu_file_create::handle() ui_menu_file_selector::ui_menu_file_selector(running_machine &machine, render_container *container, device_image_interface *image, std::string ¤t_directory, std::string ¤t_file, bool has_empty, bool has_softlist, bool has_create, int *result) : ui_menu(machine, container), m_current_directory(current_directory), - m_current_file(current_file), + m_current_file(current_file), m_entrylist(NULL) { m_image = image; diff --git a/src/emu/ui/imgcntrl.cpp b/src/emu/ui/imgcntrl.cpp index eefea73189c..d1d4c43e60f 100644 --- a/src/emu/ui/imgcntrl.cpp +++ b/src/emu/ui/imgcntrl.cpp @@ -28,10 +28,10 @@ //------------------------------------------------- ui_menu_control_device_image::ui_menu_control_device_image(running_machine &machine, render_container *container, device_image_interface *_image) - : ui_menu(machine, container), - submenu_result(0), - create_ok(false), - create_confirmed(false) + : ui_menu(machine, container), + submenu_result(0), + create_ok(false), + create_confirmed(false) { image = _image; diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp index 01d56378939..014a2a5bf92 100644 --- a/src/emu/validity.cpp +++ b/src/emu/validity.cpp @@ -287,7 +287,7 @@ void validity_checker::validate_one(const game_driver &driver) validate_roms(); validate_inputs(); validate_devices(); - m_current_config = NULL; + m_current_config = NULL; } catch (emu_fatalerror &err) { diff --git a/src/emu/video/vector.cpp b/src/emu/video/vector.cpp index 619ecd88802..8cc5aaf9bdb 100644 --- a/src/emu/video/vector.cpp +++ b/src/emu/video/vector.cpp @@ -130,7 +130,7 @@ const device_type VECTOR = &device_creator<vector_device>; vector_device::vector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_video_interface(mconfig, *this), + device_video_interface(mconfig, *this), m_vector_list(NULL), m_min_intensity(255), m_max_intensity(0) |
