summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/firetrap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/firetrap.c')
-rw-r--r--src/mame/video/firetrap.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c
index bfabf82a414..5011e5b97b4 100644
--- a/src/mame/video/firetrap.c
+++ b/src/mame/video/firetrap.c
@@ -34,13 +34,13 @@
***************************************************************************/
-void firetrap_state::palette_init()
+PALETTE_INIT_MEMBER(firetrap_state, firetrap)
{
const UINT8 *color_prom = memregion("proms")->base();
int i;
- for (i = 0; i < machine().total_colors(); i++)
+ for (i = 0; i < palette.entries(); i++)
{
int bit0, bit1, bit2, bit3, r, g, b;
@@ -55,13 +55,13 @@ void firetrap_state::palette_init()
bit2 = (color_prom[i] >> 6) & 0x01;
bit3 = (color_prom[i] >> 7) & 0x01;
g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- bit0 = (color_prom[i + machine().total_colors()] >> 0) & 0x01;
- bit1 = (color_prom[i + machine().total_colors()] >> 1) & 0x01;
- bit2 = (color_prom[i + machine().total_colors()] >> 2) & 0x01;
- bit3 = (color_prom[i + machine().total_colors()] >> 3) & 0x01;
+ bit0 = (color_prom[i + palette.entries()] >> 0) & 0x01;
+ bit1 = (color_prom[i + palette.entries()] >> 1) & 0x01;
+ bit2 = (color_prom[i + palette.entries()] >> 2) & 0x01;
+ bit3 = (color_prom[i + palette.entries()] >> 3) & 0x01;
b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- palette_set_color(machine(), i, rgb_t(r,g,b));
+ palette.set_pen_color(i, rgb_t(r,g,b));
}
}
@@ -219,24 +219,24 @@ void firetrap_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre
{
if (flip_screen()) sy -= 16;
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
+ m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect,
code & ~1,
color,
flipx,flipy,
sx,flipy ? sy : sy + 16,0);
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
+ m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect,
code | 1,
color,
flipx,flipy,
sx,flipy ? sy + 16 : sy,0);
/* redraw with wraparound */
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
+ m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect,
code & ~1,
color,
flipx,flipy,
sx - 256,flipy ? sy : sy + 16,0);
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
+ m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect,
code | 1,
color,
flipx,flipy,
@@ -244,14 +244,14 @@ void firetrap_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre
}
else
{
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
+ m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect,
code,
color,
flipx,flipy,
sx,sy,0);
/* redraw with wraparound */
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
+ m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect,
code,
color,
flipx,flipy,