diff options
Diffstat (limited to 'src/mame/video/mermaid.c')
-rw-r--r-- | src/mame/video/mermaid.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index dd0ff38b465..4306451b8f6 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -165,8 +165,8 @@ VIDEO_START( mermaid ) tilemap_set_scroll_cols(state->fg_tilemap, 32); tilemap_set_transparent_pen(state->fg_tilemap, 0); - state->helper = video_screen_auto_bitmap_alloc(machine->primary_screen); - state->helper2 = video_screen_auto_bitmap_alloc(machine->primary_screen); + state->helper = machine->primary_screen->alloc_compatible_bitmap(); + state->helper2 = machine->primary_screen->alloc_compatible_bitmap(); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) @@ -243,7 +243,7 @@ static UINT8 collision_check( running_machine *machine, rectangle* rect ) VIDEO_EOF( mermaid ) { mermaid_state *state = (mermaid_state *)machine->driver_data; - const rectangle *visarea = video_screen_get_visible_area(machine->primary_screen); + const rectangle &visarea = machine->primary_screen->visible_area(); UINT8 *spriteram = state->spriteram; int offs, offs2; @@ -291,14 +291,14 @@ VIDEO_EOF( mermaid ) rect.max_x = sx + machine->gfx[1]->width - 1; rect.max_y = sy + machine->gfx[1]->height - 1; - if (rect.min_x < visarea->min_x) - rect.min_x = visarea->min_x; - if (rect.min_y < visarea->min_y) - rect.min_y = visarea->min_y; - if (rect.max_x > visarea->max_x) - rect.max_x = visarea->max_x; - if (rect.max_y > visarea->max_y) - rect.max_y = visarea->max_y; + if (rect.min_x < visarea.min_x) + rect.min_x = visarea.min_x; + if (rect.min_y < visarea.min_y) + rect.min_y = visarea.min_y; + if (rect.max_x > visarea.max_x) + rect.max_x = visarea.max_x; + if (rect.max_y > visarea.max_y) + rect.max_y = visarea.max_y; // check collision sprite - background @@ -401,14 +401,14 @@ VIDEO_EOF( mermaid ) rect.max_x = sx + machine->gfx[1]->width - 1; rect.max_y = sy + machine->gfx[1]->height - 1; - if (rect.min_x < visarea->min_x) - rect.min_x = visarea->min_x; - if (rect.min_y < visarea->min_y) - rect.min_y = visarea->min_y; - if (rect.max_x > visarea->max_x) - rect.max_x = visarea->max_x; - if (rect.max_y > visarea->max_y) - rect.max_y = visarea->max_y; + if (rect.min_x < visarea.min_x) + rect.min_x = visarea.min_x; + if (rect.min_y < visarea.min_y) + rect.min_y = visarea.min_y; + if (rect.max_x > visarea.max_x) + rect.max_x = visarea.max_x; + if (rect.max_y > visarea.max_y) + rect.max_y = visarea.max_y; // check collision sprite - sprite @@ -489,14 +489,14 @@ VIDEO_EOF( mermaid ) rect.max_x = sx + machine->gfx[1]->width - 1; rect.max_y = sy + machine->gfx[1]->height - 1; - if (rect.min_x < visarea->min_x) - rect.min_x = visarea->min_x; - if (rect.min_y < visarea->min_y) - rect.min_y = visarea->min_y; - if (rect.max_x > visarea->max_x) - rect.max_x = visarea->max_x; - if (rect.max_y > visarea->max_y) - rect.max_y = visarea->max_y; + if (rect.min_x < visarea.min_x) + rect.min_x = visarea.min_x; + if (rect.min_y < visarea.min_y) + rect.min_y = visarea.min_y; + if (rect.max_x > visarea.max_x) + rect.max_x = visarea.max_x; + if (rect.max_y > visarea.max_y) + rect.max_y = visarea.max_y; // check collision sprite - sprite |