summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/seicross.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/seicross.c')
-rw-r--r--src/mame/video/seicross.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c
index ec6ed0df2c8..9bca7706513 100644
--- a/src/mame/video/seicross.c
+++ b/src/mame/video/seicross.c
@@ -30,7 +30,7 @@ PALETTE_INIT( seicross )
int i;
- for (i = 0;i < machine->total_colors();i++)
+ for (i = 0;i < machine.total_colors();i++)
{
int bit0,bit1,bit2,r,g,b;
@@ -55,7 +55,7 @@ PALETTE_INIT( seicross )
WRITE8_HANDLER( seicross_videoram_w )
{
- seicross_state *state = space->machine->driver_data<seicross_state>();
+ seicross_state *state = space->machine().driver_data<seicross_state>();
state->videoram[offset] = data;
tilemap_mark_tile_dirty(state->bg_tilemap, offset);
@@ -66,7 +66,7 @@ WRITE8_HANDLER( seicross_colorram_w )
/* bit 5 of the address is not used for color memory. There is just */
/* 512k of memory; every two consecutive rows share the same memory */
/* region. */
- seicross_state *state = space->machine->driver_data<seicross_state>();
+ seicross_state *state = space->machine().driver_data<seicross_state>();
offset &= 0xffdf;
@@ -79,7 +79,7 @@ WRITE8_HANDLER( seicross_colorram_w )
static TILE_GET_INFO( get_bg_tile_info )
{
- seicross_state *state = machine->driver_data<seicross_state>();
+ seicross_state *state = machine.driver_data<seicross_state>();
int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x10) << 4);
int color = state->colorram[tile_index] & 0x0f;
int flags = ((state->colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((state->colorram[tile_index] & 0x80) ? TILE_FLIPY : 0);
@@ -89,7 +89,7 @@ static TILE_GET_INFO( get_bg_tile_info )
VIDEO_START( seicross )
{
- seicross_state *state = machine->driver_data<seicross_state>();
+ seicross_state *state = machine.driver_data<seicross_state>();
state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows,
8, 8, 32, 32);
@@ -97,9 +97,9 @@ VIDEO_START( seicross )
tilemap_set_scroll_cols(state->bg_tilemap, 32);
}
-static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect )
+static void draw_sprites(running_machine &machine, bitmap_t *bitmap, const rectangle *cliprect )
{
- seicross_state *state = machine->driver_data<seicross_state>();
+ seicross_state *state = machine.driver_data<seicross_state>();
UINT8 *spriteram = state->spriteram;
UINT8 *spriteram_2 = state->spriteram2;
int offs;
@@ -107,13 +107,13 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
for (offs = state->spriteram_size - 4; offs >= 0; offs -= 4)
{
int x = spriteram[offs + 3];
- drawgfx_transpen(bitmap,cliprect,machine->gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine.gfx[1],
(spriteram[offs] & 0x3f) + ((spriteram[offs + 1] & 0x10) << 2) + 128,
spriteram[offs + 1] & 0x0f,
spriteram[offs] & 0x40,spriteram[offs] & 0x80,
x,240-spriteram[offs + 2],0);
if(x>0xf0)
- drawgfx_transpen(bitmap,cliprect,machine->gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine.gfx[1],
(spriteram[offs] & 0x3f) + ((spriteram[offs + 1] & 0x10) << 2) + 128,
spriteram[offs + 1] & 0x0f,
spriteram[offs] & 0x40,spriteram[offs] & 0x80,
@@ -123,13 +123,13 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
for (offs = state->spriteram2_size - 4; offs >= 0; offs -= 4)
{
int x = spriteram_2[offs + 3];
- drawgfx_transpen(bitmap,cliprect,machine->gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine.gfx[1],
(spriteram_2[offs] & 0x3f) + ((spriteram_2[offs + 1] & 0x10) << 2),
spriteram_2[offs + 1] & 0x0f,
spriteram_2[offs] & 0x40,spriteram_2[offs] & 0x80,
x,240-spriteram_2[offs + 2],0);
if(x>0xf0)
- drawgfx_transpen(bitmap,cliprect,machine->gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine.gfx[1],
(spriteram_2[offs] & 0x3f) + ((spriteram_2[offs + 1] & 0x10) << 2),
spriteram_2[offs + 1] & 0x0f,
spriteram_2[offs] & 0x40,spriteram_2[offs] & 0x80,
@@ -139,13 +139,13 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
SCREEN_UPDATE( seicross )
{
- seicross_state *state = screen->machine->driver_data<seicross_state>();
+ seicross_state *state = screen->machine().driver_data<seicross_state>();
int col;
for (col = 0; col < 32; col++)
tilemap_set_scrolly(state->bg_tilemap, col, state->row_scroll[col]);
tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0);
- draw_sprites(screen->machine, bitmap, cliprect);
+ draw_sprites(screen->machine(), bitmap, cliprect);
return 0;
}