diff options
| author | 2010-08-27 21:32:06 +0000 | |
|---|---|---|
| committer | 2010-08-27 21:32:06 +0000 | |
| commit | 750ab5ed12549bd85029d276c7e6d8be8b2239df (patch) | |
| tree | f7cdf4e7be5a6e9c98d2ca3507d46059aa852ad3 | |
| parent | 010cb3a0cee0f4dfaa2a2cade3d5124a5ee3abf7 (diff) | |
toaplan1: removed custum video update for demonwld; now it's the same of toaplan1
| -rw-r--r-- | src/mame/drivers/toaplan1.c | 2 | ||||
| -rw-r--r-- | src/mame/video/toaplan1.c | 33 |
2 files changed, 5 insertions, 30 deletions
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index b136f9fa375..bb7439c9c27 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -1713,7 +1713,7 @@ static MACHINE_DRIVER_START( demonwld ) MDRV_VIDEO_START(toaplan1) MDRV_VIDEO_EOF(toaplan1) - MDRV_VIDEO_UPDATE(demonwld) + MDRV_VIDEO_UPDATE(toaplan1) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index c9b853df4d9..5b919728c52 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -224,7 +224,6 @@ static void toaplan1_create_tilemaps(running_machine *machine) tilemap_set_transparent_pen(state->pf3_tilemap, 0); tilemap_set_transparent_pen(state->pf4_tilemap, 0); - memset(state->empty_tile, 0x00, sizeof(state->empty_tile)); } @@ -1172,7 +1171,7 @@ VIDEO_UPDATE( rallybik ) toaplan1_log_vram(screen->machine); - bitmap_fill(bitmap,cliprect,0); + bitmap_fill(bitmap,cliprect,0x120); tilemap_draw(bitmap, cliprect, state->pf1_tilemap, TILEMAP_DRAW_OPAQUE | 0, 0); tilemap_draw(bitmap, cliprect, state->pf1_tilemap, TILEMAP_DRAW_OPAQUE | 1, 0); @@ -1185,35 +1184,11 @@ VIDEO_UPDATE( rallybik ) tilemap_draw(bitmap, cliprect, state->pf1_tilemap, priority, 0); rallybik_draw_sprites(screen->machine, bitmap,cliprect,priority << 8); } - return 0; -} - -VIDEO_UPDATE( toaplan1 ) -{ - toaplan1_state *state = screen->machine->driver_data<toaplan1_state>(); - int priority; - - toaplan1_log_vram(screen->machine); - - bitmap_fill(screen->machine->priority_bitmap,cliprect,0); - bitmap_fill(bitmap,cliprect,0x120); -// it's really correct? - tilemap_draw(bitmap, cliprect, state->pf1_tilemap, TILEMAP_DRAW_OPAQUE | 0, 0); - tilemap_draw(bitmap, cliprect, state->pf1_tilemap, TILEMAP_DRAW_OPAQUE | 1, 0); - - for (priority = 1; priority < 16; priority++) - { - tilemap_draw_primask(bitmap, cliprect, state->pf4_tilemap, priority, priority, 0); - tilemap_draw_primask(bitmap, cliprect, state->pf3_tilemap, priority, priority, 0); - tilemap_draw_primask(bitmap, cliprect, state->pf2_tilemap, priority, priority, 0); - tilemap_draw_primask(bitmap, cliprect, state->pf1_tilemap, priority, priority, 0); - } - draw_sprites(screen->machine, bitmap,cliprect); return 0; } -VIDEO_UPDATE( demonwld ) +VIDEO_UPDATE( toaplan1 ) { toaplan1_state *state = screen->machine->driver_data<toaplan1_state>(); int priority; @@ -1223,6 +1198,7 @@ VIDEO_UPDATE( demonwld ) bitmap_fill(screen->machine->priority_bitmap,cliprect,0); bitmap_fill(bitmap,cliprect,0x120); +// it's really correct? tilemap_draw(bitmap, cliprect, state->pf1_tilemap, TILEMAP_DRAW_OPAQUE | 0, 0); tilemap_draw(bitmap, cliprect, state->pf1_tilemap, TILEMAP_DRAW_OPAQUE | 1, 0); @@ -1234,11 +1210,10 @@ VIDEO_UPDATE( demonwld ) tilemap_draw_primask(bitmap, cliprect, state->pf1_tilemap, priority, priority, 0); } - draw_sprites(screen->machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } - /**************************************************************************** Spriteram is always 1 frame ahead, suggesting spriteram buffering. There are no CPU output registers that control this so we |
