diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-10-23 09:11:47 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-10-23 09:11:47 +0200 |
commit | aa2e6f9df3239b56bfec4161b9e0b591dc18920e (patch) | |
tree | 1c2f8f8eb64a8e6441786ef2556f56e76067a926 /src/emu | |
parent | 30e830da6187e429c154e4291f210fdb40f717dd (diff) |
Reverting part of changes from previous commits as described in mail on list (nw)
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/diserial.cpp | 4 | ||||
-rw-r--r-- | src/emu/diserial.h | 2 | ||||
-rw-r--r-- | src/emu/distate.h | 2 | ||||
-rw-r--r-- | src/emu/ioport.cpp | 2 | ||||
-rw-r--r-- | src/emu/render.cpp | 16 | ||||
-rw-r--r-- | src/emu/screen.cpp | 2 | ||||
-rw-r--r-- | src/emu/sound.cpp | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/src/emu/diserial.cpp b/src/emu/diserial.cpp index 5ce3c29f98f..237d4ba7f67 100644 --- a/src/emu/diserial.cpp +++ b/src/emu/diserial.cpp @@ -454,12 +454,12 @@ uint8_t device_serial_interface::transmit_register_get_data_bit() bool device_serial_interface::is_receive_register_full() { - return (m_rcv_flags & RECEIVE_REGISTER_FULL) != 0; + return m_rcv_flags & RECEIVE_REGISTER_FULL; } bool device_serial_interface::is_transmit_register_empty() { - return (m_tra_flags & TRANSMIT_REGISTER_EMPTY) != 0; + return m_tra_flags & TRANSMIT_REGISTER_EMPTY; } const char *device_serial_interface::parity_tostring(parity_t parity) diff --git a/src/emu/diserial.h b/src/emu/diserial.h index bc3a57b7287..4555c5a05b9 100644 --- a/src/emu/diserial.h +++ b/src/emu/diserial.h @@ -109,7 +109,7 @@ protected: bool is_receive_register_full(); bool is_transmit_register_empty(); - bool is_receive_register_synchronized() const { return (m_rcv_flags & RECEIVE_REGISTER_SYNCHRONISED) != 0; } + bool is_receive_register_synchronized() const { return m_rcv_flags & RECEIVE_REGISTER_SYNCHRONISED; } bool is_receive_register_shifting() const { return m_rcv_bit_count_received > 0; } bool is_receive_framing_error() const { return m_rcv_framing_error; } bool is_receive_parity_error() const { return m_rcv_parity_error; } diff --git a/src/emu/distate.h b/src/emu/distate.h index 602f909fec6..67c706b390a 100644 --- a/src/emu/distate.h +++ b/src/emu/distate.h @@ -63,7 +63,7 @@ public: void *dataptr() const { return m_dataptr.v; } const char *symbol() const { return m_symbol.c_str(); } bool visible() const { return ((m_flags & DSF_NOSHOW) == 0); } - bool divider() const { return ((m_flags & DSF_DIVIDER) != 0); } + bool divider() const { return m_flags & DSF_DIVIDER; } device_state_interface *parent_state() const {return m_device_state;} protected: diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp index b3fc0ca25b0..84710e23453 100644 --- a/src/emu/ioport.cpp +++ b/src/emu/ioport.cpp @@ -2516,7 +2516,7 @@ bool ioport_manager::playback_read<bool>(bool &result) { uint8_t temp; playback_read(temp); - return result = temp != 0; + return result = bool(temp); } diff --git a/src/emu/render.cpp b/src/emu/render.cpp index 8886ed22309..8f3bc9cce8c 100644 --- a/src/emu/render.cpp +++ b/src/emu/render.cpp @@ -967,7 +967,7 @@ render_target::render_target(render_manager &manager, const internal_layout *lay m_layerconfig = m_base_layerconfig; // load the layout files - load_layout_files(layoutfile, (flags & RENDER_CREATE_SINGLE_FILE) != 0); + load_layout_files(layoutfile, flags & RENDER_CREATE_SINGLE_FILE); // set the current view to the first one set_view(0); @@ -1219,7 +1219,7 @@ void render_target::compute_visible_area(int32_t target_width, int32_t target_he int scale_mode = m_scale_mode; if (m_scale_mode == SCALE_FRACTIONAL_AUTO) { - bool is_rotated = ((m_manager.machine().system().flags & ORIENTATION_SWAP_XY) ^ (target_orientation & ORIENTATION_SWAP_XY)) != 0; + bool is_rotated = (m_manager.machine().system().flags & ORIENTATION_SWAP_XY) ^ (target_orientation & ORIENTATION_SWAP_XY); scale_mode = is_rotated ^ target_is_portrait ? SCALE_FRACTIONAL_Y : SCALE_FRACTIONAL_X; } @@ -2235,27 +2235,27 @@ void render_target::config_load(xml_data_node &targetnode) // modify the artwork config int tmpint = xml_get_attribute_int(&targetnode, "backdrops", -1); if (tmpint == 0 || tmpint == 1) - set_backdrops_enabled(tmpint != 0); + set_backdrops_enabled(tmpint); tmpint = xml_get_attribute_int(&targetnode, "overlays", -1); if (tmpint == 0 || tmpint == 1) - set_overlays_enabled(tmpint != 0); + set_overlays_enabled(tmpint); tmpint = xml_get_attribute_int(&targetnode, "bezels", -1); if (tmpint == 0 || tmpint == 1) - set_bezels_enabled(tmpint != 0); + set_bezels_enabled(tmpint); tmpint = xml_get_attribute_int(&targetnode, "cpanels", -1); if (tmpint == 0 || tmpint == 1) - set_cpanels_enabled(tmpint != 0); + set_cpanels_enabled(tmpint); tmpint = xml_get_attribute_int(&targetnode, "marquees", -1); if (tmpint == 0 || tmpint == 1) - set_marquees_enabled(tmpint != 0); + set_marquees_enabled(tmpint); tmpint = xml_get_attribute_int(&targetnode, "zoom", -1); if (tmpint == 0 || tmpint == 1) - set_zoom_to_screen(tmpint != 0); + set_zoom_to_screen(tmpint); // apply orientation tmpint = xml_get_attribute_int(&targetnode, "rotate", -1); diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp index 2997b9ba5e0..4742963d9d3 100644 --- a/src/emu/screen.cpp +++ b/src/emu/screen.cpp @@ -246,7 +246,7 @@ void screen_device_svg_renderer::output_change(const char *outname, int32_t valu auto l = m_key_ids.find(outname); if (l == m_key_ids.end()) return; - m_key_state[l->second] = value != 0; + m_key_state[l->second] = value; } void screen_device_svg_renderer::compute_initial_bboxes(std::vector<bbox> &bboxes) diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index 89bb32e7a3f..95f2d85d1b4 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -1060,7 +1060,7 @@ void sound_manager::update(void *ptr, int param) // force all the speaker streams to generate the proper number of samples int samples_this_update = 0; for (speaker_device &speaker : speaker_device_iterator(machine().root_device())) - speaker.mix(&m_leftmix[0], &m_rightmix[0], samples_this_update, (m_muted & MUTE_REASON_SYSTEM) != 0); + speaker.mix(&m_leftmix[0], &m_rightmix[0], samples_this_update, (m_muted & MUTE_REASON_SYSTEM)); // now downmix the final result uint32_t finalmix_step = machine().video().speed_factor(); |