Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

More cleanup (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2013-02-08 14:37:46 +00:00
parent de7ee87f23
commit 3fad03b0b2
4 changed files with 100 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mame/drivers/redclash.c
View File

@ -25,50 +25,49 @@ TODO:
#include "includes/ladybug.h" #include "includes/ladybug.h"
static WRITE8_HANDLER( irqack_w ) WRITE8_MEMBER( ladybug_state::irqack_w )
{ {
ladybug_state *state = space.machine().driver_data<ladybug_state>(); m_maincpu->set_input_line(0, CLEAR_LINE);
state->m_maincpu->set_input_line(0, CLEAR_LINE);
} }
static ADDRESS_MAP_START( zerohour_map, AS_PROGRAM, 8, ladybug_state ) static ADDRESS_MAP_START( zerohour_map, AS_PROGRAM, 8, ladybug_state )
AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_RANGE(0x3000, 0x37ff) AM_RAM
AM_RANGE(0x3800, 0x3bff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0x3800, 0x3bff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE_LEGACY(redclash_videoram_w) AM_SHARE("videoram") AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(redclash_videoram_w) AM_SHARE("videoram")
AM_RANGE(0x4800, 0x4800) AM_READ_PORT("IN0") /* IN0 */ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("IN0") /* IN0 */
AM_RANGE(0x4801, 0x4801) AM_READ_PORT("IN1") /* IN1 */ AM_RANGE(0x4801, 0x4801) AM_READ_PORT("IN1") /* IN1 */
AM_RANGE(0x4802, 0x4802) AM_READ_PORT("DSW1") /* DSW0 */ AM_RANGE(0x4802, 0x4802) AM_READ_PORT("DSW1") /* DSW0 */
AM_RANGE(0x4803, 0x4803) AM_READ_PORT("DSW2") /* DSW1 */ AM_RANGE(0x4803, 0x4803) AM_READ_PORT("DSW2") /* DSW1 */
AM_RANGE(0x5000, 0x5007) AM_WRITENOP /* to sound board */ AM_RANGE(0x5000, 0x5007) AM_WRITENOP /* to sound board */
AM_RANGE(0x5800, 0x5800) AM_WRITE_LEGACY(redclash_star0_w) AM_RANGE(0x5800, 0x5800) AM_WRITE(redclash_star0_w)
AM_RANGE(0x5801, 0x5804) AM_WRITENOP /* to sound board */ AM_RANGE(0x5801, 0x5804) AM_WRITENOP /* to sound board */
AM_RANGE(0x5805, 0x5805) AM_WRITE_LEGACY(redclash_star1_w) AM_RANGE(0x5805, 0x5805) AM_WRITE(redclash_star1_w)
AM_RANGE(0x5806, 0x5806) AM_WRITE_LEGACY(redclash_star2_w) AM_RANGE(0x5806, 0x5806) AM_WRITE(redclash_star2_w)
AM_RANGE(0x5807, 0x5807) AM_WRITE_LEGACY(redclash_flipscreen_w) AM_RANGE(0x5807, 0x5807) AM_WRITE(redclash_flipscreen_w)
AM_RANGE(0x7000, 0x7000) AM_WRITE_LEGACY(redclash_star_reset_w) AM_RANGE(0x7000, 0x7000) AM_WRITE(redclash_star_reset_w)
AM_RANGE(0x7800, 0x7800) AM_WRITE_LEGACY(irqack_w) AM_RANGE(0x7800, 0x7800) AM_WRITE(irqack_w)
ADDRESS_MAP_END ADDRESS_MAP_END
static ADDRESS_MAP_START( redclash_map, AS_PROGRAM, 8, ladybug_state ) static ADDRESS_MAP_START( redclash_map, AS_PROGRAM, 8, ladybug_state )
AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0x0000, 0x2fff) AM_ROM
// AM_RANGE(0x3000, 0x3000) AM_WRITENOP // AM_RANGE(0x3000, 0x3000) AM_WRITENOP
// AM_RANGE(0x3800, 0x3800) AM_WRITENOP // AM_RANGE(0x3800, 0x3800) AM_WRITENOP
AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE_LEGACY(redclash_videoram_w) AM_SHARE("videoram") AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(redclash_videoram_w) AM_SHARE("videoram")
AM_RANGE(0x4800, 0x4800) AM_READ_PORT("IN0") /* IN0 */ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("IN0") /* IN0 */
AM_RANGE(0x4801, 0x4801) AM_READ_PORT("IN1") /* IN1 */ AM_RANGE(0x4801, 0x4801) AM_READ_PORT("IN1") /* IN1 */
AM_RANGE(0x4802, 0x4802) AM_READ_PORT("DSW1") /* DSW0 */ AM_RANGE(0x4802, 0x4802) AM_READ_PORT("DSW1") /* DSW0 */
AM_RANGE(0x4803, 0x4803) AM_READ_PORT("DSW2") /* DSW1 */ AM_RANGE(0x4803, 0x4803) AM_READ_PORT("DSW2") /* DSW1 */
AM_RANGE(0x5000, 0x5007) AM_WRITENOP /* to sound board */ AM_RANGE(0x5000, 0x5007) AM_WRITENOP /* to sound board */
AM_RANGE(0x5800, 0x5800) AM_WRITE_LEGACY(redclash_star0_w) AM_RANGE(0x5800, 0x5800) AM_WRITE(redclash_star0_w)
AM_RANGE(0x5801, 0x5801) AM_WRITE_LEGACY(redclash_gfxbank_w) AM_RANGE(0x5801, 0x5801) AM_WRITE(redclash_gfxbank_w)
AM_RANGE(0x5805, 0x5805) AM_WRITE_LEGACY(redclash_star1_w) AM_RANGE(0x5805, 0x5805) AM_WRITE(redclash_star1_w)
AM_RANGE(0x5806, 0x5806) AM_WRITE_LEGACY(redclash_star2_w) AM_RANGE(0x5806, 0x5806) AM_WRITE(redclash_star2_w)
AM_RANGE(0x5807, 0x5807) AM_WRITE_LEGACY(redclash_flipscreen_w) AM_RANGE(0x5807, 0x5807) AM_WRITE(redclash_flipscreen_w)
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_RANGE(0x6000, 0x67ff) AM_RAM
AM_RANGE(0x6800, 0x6bff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0x6800, 0x6bff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x7000, 0x7000) AM_WRITE_LEGACY(redclash_star_reset_w) AM_RANGE(0x7000, 0x7000) AM_WRITE(redclash_star_reset_w)
AM_RANGE(0x7800, 0x7800) AM_WRITE_LEGACY(irqack_w) AM_RANGE(0x7800, 0x7800) AM_WRITE(irqack_w)
ADDRESS_MAP_END ADDRESS_MAP_END
/* /*

34
src/mame/includes/ladybug.h
View File

@ -82,21 +82,21 @@ public:
void screen_eof_sraider(screen_device &screen, bool state); void screen_eof_sraider(screen_device &screen, bool state);
void screen_eof_redclash(screen_device &screen, bool state); void screen_eof_redclash(screen_device &screen, bool state);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
DECLARE_WRITE8_MEMBER( redclash_videoram_w );
DECLARE_WRITE8_MEMBER( redclash_gfxbank_w );
DECLARE_WRITE8_MEMBER( redclash_flipscreen_w );
DECLARE_WRITE8_MEMBER( redclash_star0_w );
DECLARE_WRITE8_MEMBER( redclash_star1_w );
DECLARE_WRITE8_MEMBER( redclash_star2_w );
DECLARE_WRITE8_MEMBER( redclash_star_reset_w );
DECLARE_WRITE8_MEMBER( irqack_w );
/* sraider uses the zerohour star generator board */
void redclash_set_stars_enable(UINT8 on);
void redclash_update_stars_state();
void redclash_set_stars_speed(UINT8 speed);
void redclash_draw_stars(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 palette_offset, UINT8 sraider, UINT8 firstx, UINT8 lastx);
void redclash_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
void redclash_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect );
}; };
/*----------- defined in video/redclash.c -----------*/
DECLARE_WRITE8_HANDLER( redclash_videoram_w );
DECLARE_WRITE8_HANDLER( redclash_gfxbank_w );
DECLARE_WRITE8_HANDLER( redclash_flipscreen_w );
DECLARE_WRITE8_HANDLER( redclash_star0_w );
DECLARE_WRITE8_HANDLER( redclash_star1_w );
DECLARE_WRITE8_HANDLER( redclash_star2_w );
DECLARE_WRITE8_HANDLER( redclash_star_reset_w );
/* sraider uses the zerohour star generator board */
void redclash_set_stars_enable(running_machine &machine, UINT8 on);
void redclash_update_stars_state(running_machine &machine);
void redclash_set_stars_speed(running_machine &machine, UINT8 speed);
void redclash_draw_stars(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 palette_offset, UINT8 sraider, UINT8 firstx, UINT8 lastx);

10
src/mame/video/ladybug.c
View File

@ -175,7 +175,7 @@ WRITE8_MEMBER(ladybug_state::sraider_io_w)
m_grid_color = data & 0x70; m_grid_color = data & 0x70;
redclash_set_stars_enable(machine(), (data & 0x08) >> 3); redclash_set_stars_enable((data & 0x08) >> 3);
/* /*
* There must be a subtle clocking difference between * There must be a subtle clocking difference between
@ -183,7 +183,7 @@ WRITE8_MEMBER(ladybug_state::sraider_io_w)
* hence the -1 here * hence the -1 here
*/ */
redclash_set_stars_speed(machine(), (data & 0x07) - 1); redclash_set_stars_speed((data & 0x07) - 1);
} }
TILE_GET_INFO_MEMBER(ladybug_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(ladybug_state::get_bg_tile_info)
@ -301,7 +301,7 @@ void ladybug_state::screen_eof_sraider(screen_device &screen, bool state)/* upda
{ {
// falling edge // falling edge
if (!state) if (!state)
redclash_update_stars_state(machine()); redclash_update_stars_state();
} }
UINT32 ladybug_state::screen_update_sraider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) UINT32 ladybug_state::screen_update_sraider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@ -328,9 +328,9 @@ UINT32 ladybug_state::screen_update_sraider(screen_device &screen, bitmap_ind16
// draw the stars // draw the stars
if (flip_screen()) if (flip_screen())
redclash_draw_stars(machine(), bitmap, cliprect, 0x60, 1, 0x27, 0xff); redclash_draw_stars(bitmap, cliprect, 0x60, 1, 0x27, 0xff);
else else
redclash_draw_stars(machine(), bitmap, cliprect, 0x60, 1, 0x00, 0xd8); redclash_draw_stars(bitmap, cliprect, 0x60, 1, 0x00, 0xd8);
// draw the gridlines // draw the gridlines
colortable_palette_set_color(machine().colortable, 0x40, MAKE_RGB(m_grid_color & 0x40 ? 0xff : 0, colortable_palette_set_color(machine().colortable, 0x40, MAKE_RGB(m_grid_color & 0x40 ? 0xff : 0,

142
src/mame/video/redclash.c
View File

@ -100,34 +100,26 @@ PALETTE_INIT_MEMBER(ladybug_state,redclash)
colortable_entry_set_value(machine().colortable, i, (i - 0x60) + 0x20); colortable_entry_set_value(machine().colortable, i, (i - 0x60) + 0x20);
} }
WRITE8_HANDLER( redclash_videoram_w ) WRITE8_HANDLER( ladybug_state::redclash_videoram_w )
{ {
ladybug_state *state = space.machine().driver_data<ladybug_state>(); m_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
state->m_videoram[offset] = data;
state->m_fg_tilemap->mark_tile_dirty(offset);
} }
WRITE8_HANDLER( redclash_gfxbank_w ) WRITE8_HANDLER( ladybug_state::redclash_gfxbank_w )
{ {
ladybug_state *state = space.machine().driver_data<ladybug_state>(); if (m_gfxbank != (data & 0x01))
if (state->m_gfxbank != (data & 0x01))
{ {
state->m_gfxbank = data & 0x01; m_gfxbank = data & 0x01;
space.machine().tilemap().mark_all_dirty(); machine().tilemap().mark_all_dirty();
} }
} }
WRITE8_HANDLER( redclash_flipscreen_w ) WRITE8_HANDLER( ladybug_state::redclash_flipscreen_w )
{ {
ladybug_state *state = space.machine().driver_data<ladybug_state>(); flip_screen_set(data & 0x01);
state->flip_screen_set(data & 0x01);
} }
void redclash_set_stars_enable( running_machine &machine, UINT8 on ); //temp
void redclash_set_stars_speed( running_machine &machine, UINT8 speed ); //temp
/* /*
star_speed: star_speed:
0 = unused 0 = unused
@ -139,33 +131,27 @@ star_speed:
6 = backwards medium 6 = backwards medium
7 = backwards fast 7 = backwards fast
*/ */
WRITE8_HANDLER( redclash_star0_w ) WRITE8_HANDLER( ladybug_state::redclash_star0_w )
{ {
ladybug_state *state = space.machine().driver_data<ladybug_state>(); m_star_speed = (m_star_speed & ~1) | ((data & 1) << 0);
redclash_set_stars_speed(m_star_speed);
state->m_star_speed = (state->m_star_speed & ~1) | ((data & 1) << 0);
redclash_set_stars_speed(space.machine(), state->m_star_speed);
} }
WRITE8_HANDLER( redclash_star1_w ) WRITE8_HANDLER( ladybug_state::redclash_star1_w )
{ {
ladybug_state *state = space.machine().driver_data<ladybug_state>(); m_star_speed = (m_star_speed & ~2) | ((data & 1) << 1);
redclash_set_stars_speed(m_star_speed);
state->m_star_speed = (state->m_star_speed & ~2) | ((data & 1) << 1);
redclash_set_stars_speed(space.machine(), state->m_star_speed);
} }
WRITE8_HANDLER( redclash_star2_w ) WRITE8_HANDLER( ladybug_state::redclash_star2_w )
{ {
ladybug_state *state = space.machine().driver_data<ladybug_state>(); m_star_speed = (m_star_speed & ~4) | ((data & 1) << 2);
redclash_set_stars_speed( m_star_speed);
state->m_star_speed = (state->m_star_speed & ~4) | ((data & 1) << 2);
redclash_set_stars_speed(space.machine(), state->m_star_speed);
} }
WRITE8_HANDLER( redclash_star_reset_w ) WRITE8_HANDLER( ladybug_state::redclash_star_reset_w )
{ {
redclash_set_stars_enable(space.machine(), 1); redclash_set_stars_enable(1);
} }
TILE_GET_INFO_MEMBER(ladybug_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(ladybug_state::get_fg_tile_info)
@ -182,13 +168,12 @@ VIDEO_START_MEMBER(ladybug_state,redclash)
m_fg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0);
} }
static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) void ladybug_state::redclash_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect )
{ {
ladybug_state *state = machine.driver_data<ladybug_state>(); UINT8 *spriteram = m_spriteram;
UINT8 *spriteram = state->m_spriteram;
int i, offs; int i, offs;
for (offs = state->m_spriteram.bytes() - 0x20; offs >= 0; offs -= 0x20) for (offs = m_spriteram.bytes() - 0x20; offs >= 0; offs -= 0x20)
{ {
i = 0; i = 0;
while (i < 0x20 && spriteram[offs + i] != 0) while (i < 0x20 && spriteram[offs + i] != 0)
@ -209,15 +194,15 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
{ {
case 3: /* 24x24 */ case 3: /* 24x24 */
{ {
int code = ((spriteram[offs + i + 1] & 0xf0) >> 4) + ((state->m_gfxbank & 1) << 4); int code = ((spriteram[offs + i + 1] & 0xf0) >> 4) + ((m_gfxbank & 1) << 4);
drawgfx_transpen(bitmap,cliprect,machine.gfx[3], drawgfx_transpen(bitmap,cliprect,machine().gfx[3],
code, code,
color, color,
0,0, 0,0,
sx,sy - 16,0); sx,sy - 16,0);
/* wraparound */ /* wraparound */
drawgfx_transpen(bitmap,cliprect,machine.gfx[3], drawgfx_transpen(bitmap,cliprect,machine().gfx[3],
code, code,
color, color,
0,0, 0,0,
@ -228,10 +213,10 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
case 2: /* 16x16 */ case 2: /* 16x16 */
if (spriteram[offs + i] & 0x20) /* zero hour spaceships */ if (spriteram[offs + i] & 0x20) /* zero hour spaceships */
{ {
int code = ((spriteram[offs + i + 1] & 0xf8) >> 3) + ((state->m_gfxbank & 1) << 5); int code = ((spriteram[offs + i + 1] & 0xf8) >> 3) + ((m_gfxbank & 1) << 5);
int bank = (spriteram[offs + i + 1] & 0x02) >> 1; int bank = (spriteram[offs + i + 1] & 0x02) >> 1;
drawgfx_transpen(bitmap,cliprect,machine.gfx[4+bank], drawgfx_transpen(bitmap,cliprect,machine().gfx[4+bank],
code, code,
color, color,
0,0, 0,0,
@ -239,9 +224,9 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
} }
else else
{ {
int code = ((spriteram[offs + i + 1] & 0xf0) >> 4) + ((state->m_gfxbank & 1) << 4); int code = ((spriteram[offs + i + 1] & 0xf0) >> 4) + ((m_gfxbank & 1) << 4);
drawgfx_transpen(bitmap,cliprect,machine.gfx[2], drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
code, code,
color, color,
0,0, 0,0,
@ -250,7 +235,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
break; break;
case 1: /* 8x8 */ case 1: /* 8x8 */
drawgfx_transpen(bitmap,cliprect,machine.gfx[1], drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
spriteram[offs + i + 1],// + 4 * (spriteram[offs + i + 2] & 0x10), spriteram[offs + i + 1],// + 4 * (spriteram[offs + i + 2] & 0x10),
color, color,
0,0, 0,0,
@ -266,18 +251,17 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
} }
} }
static void draw_bullets( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) void ladybug_state::redclash_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect )
{ {
ladybug_state *state = machine.driver_data<ladybug_state>();
int offs; int offs;
for (offs = 0; offs < 0x20; offs++) for (offs = 0; offs < 0x20; offs++)
{ {
// sx = state->m_videoramoffs]; // sx = m_videoramoffs];
int sx = 8 * offs + (state->m_videoram[offs] & 0x07); /* ?? */ int sx = 8 * offs + (m_videoram[offs] & 0x07); /* ?? */
int sy = 0xff - state->m_videoram[offs + 0x20]; int sy = 0xff - m_videoram[offs + 0x20];
if (state->flip_screen()) if (flip_screen())
{ {
sx = 240 - sx; sx = 240 - sx;
} }
@ -301,37 +285,35 @@ static void draw_bullets( running_machine &machine, bitmap_ind16 &bitmap, const
*/ */
/* This line can reset the LFSR to zero and disables the star generator */ /* This line can reset the LFSR to zero and disables the star generator */
void redclash_set_stars_enable( running_machine &machine, UINT8 on ) void ladybug_state::redclash_set_stars_enable(UINT8 on)
{ ladybug_state *state = machine.driver_data<ladybug_state>(); {
if ((m_stars_enable == 0) && (on == 1))
if ((state->m_stars_enable == 0) && (on == 1))
{ {
state->m_stars_offset = 0; m_stars_offset = 0;
} }
state->m_stars_enable = on; m_stars_enable = on;
} }
/* This sets up which starfield to draw and the offset, */ /* This sets up which starfield to draw and the offset, */
/* To be called from SCREEN_VBLANK() */ /* To be called from SCREEN_VBLANK() */
void redclash_update_stars_state( running_machine &machine ) void ladybug_state::redclash_update_stars_state()
{ {
ladybug_state *state = machine.driver_data<ladybug_state>(); if (m_stars_enable == 0)
if (state->m_stars_enable == 0)
return; return;
state->m_stars_count++; m_stars_count++;
state->m_stars_count %= 2; m_stars_count %= 2;
if (state->m_stars_count == 0) if (m_stars_count == 0)
{ {
state->m_stars_offset += ((state->m_stars_speed * 2) - 0x09); m_stars_offset += ((m_stars_speed * 2) - 0x09);
state->m_stars_offset %= 256 * 256; m_stars_offset %= 256 * 256;
state->m_stars_state = 0; m_stars_state = 0;
} }
else else
state->m_stars_state = 0x1fc71; m_stars_state = 0x1fc71;
} }
/* Set the speed register (3 bits) */ /* Set the speed register (3 bits) */
@ -347,10 +329,9 @@ void redclash_update_stars_state( running_machine &machine )
* 7 right/up fast (+5/2 pix per frame) * 7 right/up fast (+5/2 pix per frame)
*/ */
void redclash_set_stars_speed( running_machine &machine, UINT8 speed ) void ladybug_state::redclash_set_stars_speed(UINT8 speed )
{ {
ladybug_state *state = machine.driver_data<ladybug_state>(); m_stars_speed = speed;
state->m_stars_speed = speed;
} }
/* Draw the stars */ /* Draw the stars */
@ -358,23 +339,22 @@ void redclash_set_stars_speed( running_machine &machine, UINT8 speed )
/* Space Raider doesn't use the Va bit, and it is also set up to */ /* Space Raider doesn't use the Va bit, and it is also set up to */
/* window the stars to a certain x range */ /* window the stars to a certain x range */
void redclash_draw_stars( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 palette_offset, UINT8 sraider, UINT8 firstx, UINT8 lastx ) void ladybug_state::redclash_draw_stars(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 palette_offset, UINT8 sraider, UINT8 firstx, UINT8 lastx )
{ {
ladybug_state *redclash = machine.driver_data<ladybug_state>();
int i; int i;
UINT8 tempbit, feedback, star_color, xloc, yloc; UINT8 tempbit, feedback, star_color, xloc, yloc;
UINT32 state; UINT32 state;
UINT8 hcond, vcond; UINT8 hcond, vcond;
if (redclash->m_stars_enable == 0) if (m_stars_enable == 0)
return; return;
state = redclash->m_stars_state; state = m_stars_state;
for(i = 0; i < 256 * 256; i++) for(i = 0; i < 256 * 256; i++)
{ {
xloc = (redclash->m_stars_offset + i) % 256; xloc = (m_stars_offset + i) % 256;
yloc = ((redclash->m_stars_offset + i) /256 ) % 256; yloc = ((m_stars_offset + i) /256 ) % 256;
if ((state & 0x10000) == 0) if ((state & 0x10000) == 0)
tempbit = 1; tempbit = 1;
@ -420,15 +400,15 @@ void ladybug_state::screen_eof_redclash(screen_device &screen, bool state)
{ {
// falling edge // falling edge
if (!state) if (!state)
redclash_update_stars_state(machine()); redclash_update_stars_state();
} }
UINT32 ladybug_state::screen_update_redclash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) UINT32 ladybug_state::screen_update_redclash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{ {
bitmap.fill(get_black_pen(machine()), cliprect); bitmap.fill(get_black_pen(machine()), cliprect);
redclash_draw_stars(machine(), bitmap, cliprect, 0x60, 0, 0x00, 0xff); redclash_draw_stars(bitmap, cliprect, 0x60, 0, 0x00, 0xff);
::draw_sprites(machine(), bitmap, cliprect); redclash_draw_sprites(bitmap, cliprect);
draw_bullets(machine(), bitmap, cliprect); redclash_draw_bullets(bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0; return 0;
} }