diff options
author | 2015-11-15 13:07:26 +0100 | |
---|---|---|
committer | 2015-11-15 13:07:26 +0100 | |
commit | 5200f15ace282ad246bd38af900472db353ba241 (patch) | |
tree | 93532e9717e2284223243dcba1ffddeff479e790 /src/emu/render.cpp | |
parent | 2844aa7b02e3e76abc6e6707ebba0d6fa1c092be (diff) | |
parent | 15f6df6d66146007b7052d5efaa4513cdfd4ac79 (diff) |
Merge remote-tracking branch 'remotes/mamedev/master'
Diffstat (limited to 'src/emu/render.cpp')
-rw-r--r-- | src/emu/render.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/render.cpp b/src/emu/render.cpp index f9e55bf9abe..c86b3f914c5 100644 --- a/src/emu/render.cpp +++ b/src/emu/render.cpp @@ -1204,7 +1204,7 @@ void render_target::compute_minimum_size(INT32 &minwidth, INT32 &minheight) throw emu_fatalerror("Mandatory artwork is missing"); // scan the current view for all screens - for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; layer++) + for (item_layer layer = ITEM_LAYER_FIRST; layer < ITEM_LAYER_MAX; ++layer) // iterate over items in the layer for (layout_view::item *curitem = m_curview->first_item(layer); curitem != NULL; curitem = curitem->next()) @@ -1287,7 +1287,7 @@ render_primitive_list &render_target::get_primitives() // iterate over layers back-to-front, but only if we're running if (m_manager.machine().phase() >= MACHINE_PHASE_RESET) - for (item_layer layernum = ITEM_LAYER_FIRST; layernum < ITEM_LAYER_MAX; layernum++) + for (item_layer layernum = ITEM_LAYER_FIRST; layernum < ITEM_LAYER_MAX; ++layernum) { int blendmode; item_layer layer = get_layer_and_blendmode(*m_curview, layernum, blendmode); @@ -1916,7 +1916,7 @@ bool render_target::map_point_internal(INT32 target_x, INT32 target_y, render_co } // loop through each layer - for (item_layer layernum = ITEM_LAYER_FIRST; layernum < ITEM_LAYER_MAX; layernum++) + for (item_layer layernum = ITEM_LAYER_FIRST; layernum < ITEM_LAYER_MAX; ++layernum) { int blendmode; item_layer layer = get_layer_and_blendmode(*m_curview, layernum, blendmode); @@ -2500,8 +2500,8 @@ render_target *render_manager::target_by_index(int index) const float render_manager::ui_aspect(render_container *rc) { - int orient = 0; - float aspect = 1.0f; + int orient; + float aspect; if (rc == m_ui_container || rc == NULL) { // ui container, aggregated multi-screen target |