diff options
Diffstat (limited to 'src/mame/video/decocass.cpp')
-rw-r--r-- | src/mame/video/decocass.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/video/decocass.cpp b/src/mame/video/decocass.cpp index a93edf2fbfc..bf06d8cd5a9 100644 --- a/src/mame/video/decocass.cpp +++ b/src/mame/video/decocass.cpp @@ -252,10 +252,10 @@ void decocass_state::draw_special_priority(bitmap_ind16 &bitmap, bitmap_ind8 &pr const uint8_t *objdata1 = m_gfxdecode->gfx(3)->get_data(1); assert(m_gfxdecode->gfx(3)->rowbytes() == 64); - for (int y = cliprect.min_y; y <= cliprect.max_y; y++) + for (int y = cliprect.top(); y <= cliprect.bottom(); y++) { const int dy = y - sy; - for (int x = cliprect.min_x; x <= cliprect.max_x; x++) + for (int x = cliprect.left(); x <= cliprect.right(); x++) { const int dx = x - sx; @@ -308,7 +308,7 @@ void decocass_state::draw_center(bitmap_ind16 &bitmap, const rectangle &cliprect sx = (m_center_h_shift_space >> 2) & 0x3c; for (y = 0; y < 4; y++) - if ((sy + y) >= cliprect.min_y && (sy + y) <= cliprect.max_y) + if ((sy + y) >= cliprect.top() && (sy + y) <= cliprect.bottom()) { if (((sy + y) & m_color_center_bot & 3) == (sy & m_color_center_bot & 3)) for (x = 0; x < 256; x++) @@ -588,10 +588,10 @@ void decocass_state::draw_missiles(bitmap_ind16 &bitmap, bitmap_ind8 &priority, sy = 240 - sy + missile_y_adjust_flip_screen; } sy -= missile_y_adjust; - if (sy >= cliprect.min_y && sy <= cliprect.max_y) + if (sy >= cliprect.top() && sy <= cliprect.bottom()) for (x = 0; x < 4; x++) { - if (sx >= cliprect.min_x && sx <= cliprect.max_x) + if (sx >= cliprect.left() && sx <= cliprect.right()) { bitmap.pix16(sy, sx) = (m_color_missiles & 7) | 8; priority.pix8(sy, sx) |= 1 << 2; @@ -607,10 +607,10 @@ void decocass_state::draw_missiles(bitmap_ind16 &bitmap, bitmap_ind8 &priority, sy = 240 - sy + missile_y_adjust_flip_screen; } sy -= missile_y_adjust; - if (sy >= cliprect.min_y && sy <= cliprect.max_y) + if (sy >= cliprect.top() && sy <= cliprect.bottom()) for (x = 0; x < 4; x++) { - if (sx >= cliprect.min_x && sx <= cliprect.max_x) + if (sx >= cliprect.left() && sx <= cliprect.right()) { bitmap.pix16(sy, sx) = ((m_color_missiles >> 4) & 7) | 8; priority.pix8(sy, sx) |= 1 << 3; @@ -663,13 +663,13 @@ void decocass_state::draw_edge(bitmap_ind16 &bitmap, const rectangle &cliprect, // technically our y drawing probably shouldn't wrap / mask, but simply draw the 128pixel high 'edge' at the requested position // see note above this funciton - for (y=clip.min_y; y<=clip.max_y;y++) + for (y=clip.top(); y<=clip.bottom(); y++) { int srcline = (y + scrolly) & 0x1ff; uint16_t* src = &srcbitmap->pix16(srcline); uint16_t* dst = &bitmap.pix16(y); - for (x=clip.min_x; x<=clip.max_x;x++) + for (x=clip.left(); x<=clip.right(); x++) { int srccol = 0; |