diff options
author | Aaron Giles <aaron@aarongiles.com> | 2011-12-31 07:52:26 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2011-12-31 07:52:26 +0000 |
commit | 9cae38e0d82a71a20619c5ba49dce4eaa0bb0cc2 (patch) | |
tree | 56135caff0d5610acb3b1fc34b640853fe27b104 /src/mame/video/madalien.c | |
parent | 384b14a64b7e2a732b9b3429fc6d7aa443486c6c (diff) |
Converted bitmap_t and rectangle into proper classes. Replaced BITMAP_ADDR*
macros with bitmap->pix* functions, and moved bitmap_fill() to bitmap->fill()
among other similar changes. Bitmap fields now only available via accessors.
Replaced sect_rect with &= and union_rect with |= operators for rectangle
classes. Some general cleanup as a result of these changes. [Aaron Giles]
Diffstat (limited to 'src/mame/video/madalien.c')
-rw-r--r-- | src/mame/video/madalien.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index bdda00f6665..6c86750ee19 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -180,8 +180,8 @@ static void draw_edges(running_machine &machine, bitmap_t *bitmap, const rectang clip_edge2.min_y = *state->m_edge2_pos | 0x80; } - sect_rect(&clip_edge1, cliprect); - sect_rect(&clip_edge2, cliprect); + clip_edge1 &= *cliprect; + clip_edge2 &= *cliprect; tilemap_mark_all_tiles_dirty(state->m_tilemap_edge1[scroll_mode]); tilemap_mark_all_tiles_dirty(state->m_tilemap_edge2[scroll_mode]); @@ -227,8 +227,8 @@ static void draw_headlight(running_machine &machine, bitmap_t *bitmap, const rec if ((hx < cliprect->min_x) || (hx > cliprect->max_x)) continue; - if (*BITMAP_ADDR16(state->m_headlight_bitmap, y, x) != 0) - *BITMAP_ADDR16(bitmap, hy, hx) |= 8; + if (state->m_headlight_bitmap->pix16(y, x) != 0) + bitmap->pix16(hy, hx) |= 8; } } } @@ -265,7 +265,7 @@ static SCREEN_UPDATE( madalien ) // mode 3 - transition from A to B int scroll_mode = *state->m_scroll & 3; - bitmap_fill(bitmap, cliprect, 0); + bitmap->fill(0, *cliprect); draw_edges(screen.machine(), bitmap, cliprect, flip, scroll_mode); draw_foreground(screen.machine(), bitmap, cliprect, flip); @@ -298,7 +298,7 @@ static SCREEN_UPDATE( madalien ) for (y = cliprect->min_y; y <= cliprect->max_y ; y++) for (x = min_x; x <= max_x; x++) if ((x >= cliprect->min_x) && (x <= cliprect->max_x)) - *BITMAP_ADDR16(bitmap, y, x) |= 8; + bitmap->pix16(y, x) |= 8; } draw_headlight(screen.machine(), bitmap, cliprect, flip); |