summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess
diff options
context:
space:
mode:
author Alex W. Jackson <alex.w.jackson@gmail.com>2014-03-19 11:03:38 +0000
committer Alex W. Jackson <alex.w.jackson@gmail.com>2014-03-19 11:03:38 +0000
commitf27a84da26c7dc7fb06de8306c7b235acaa647fd (patch)
tree50b71fc30250dd0431f1b1ad4f0bb155967f1f96 /src/mess
parent9e73dd723ba03812672d90678218457982c8a9c0 (diff)
Removed palette_device parameter from gfx draw methods. All draw methods now use m_palette (nw)
Diffstat (limited to 'src/mess')
-rw-r--r--src/mess/drivers/apexc.c2
-rw-r--r--src/mess/drivers/ax20.c2
-rw-r--r--src/mess/drivers/casloopy.c2
-rw-r--r--src/mess/drivers/itt3030.c2
-rw-r--r--src/mess/drivers/multi8.c2
-rw-r--r--src/mess/drivers/pv1000.c4
-rw-r--r--src/mess/drivers/supracan.c4
-rw-r--r--src/mess/drivers/ti99_2.c2
-rw-r--r--src/mess/drivers/tk80bs.c2
-rw-r--r--src/mess/video/733_asr.c2
-rw-r--r--src/mess/video/911_vdt.c2
-rw-r--r--src/mess/video/ac1.c4
-rw-r--r--src/mess/video/arcadia.c6
-rw-r--r--src/mess/video/cgenie.c18
-rw-r--r--src/mess/video/comquest.c2
-rw-r--r--src/mess/video/galeb.c2
-rw-r--r--src/mess/video/intv.c12
-rw-r--r--src/mess/video/kramermc.c2
-rw-r--r--src/mess/video/mz700.c2
-rw-r--r--src/mess/video/nascom1.c8
-rw-r--r--src/mess/video/p2000m.c2
-rw-r--r--src/mess/video/pc1251.c4
-rw-r--r--src/mess/video/pc1401.c4
-rw-r--r--src/mess/video/pc1403.c12
-rw-r--r--src/mess/video/pdp1.c2
-rw-r--r--src/mess/video/stic.c12
-rw-r--r--src/mess/video/tx0.c2
-rw-r--r--src/mess/video/ut88.c2
-rw-r--r--src/mess/video/vtech2.c16
-rw-r--r--src/mess/video/x68k.c2
30 files changed, 70 insertions, 70 deletions
diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c
index 8fef34b7e8f..4af55394eee 100644
--- a/src/mess/drivers/apexc.c
+++ b/src/mess/drivers/apexc.c
@@ -591,7 +591,7 @@ void apexc_state::apexc_draw_led(bitmap_ind16 &bitmap, int x, int y, int state)
/* write a single char on screen */
void apexc_state::apexc_draw_char(bitmap_ind16 &bitmap, char character, int x, int y, int color)
{
- m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,bitmap.cliprect(), character-32, color, 0, 0,
+ m_gfxdecode->gfx(0)->transpen(bitmap,bitmap.cliprect(), character-32, color, 0, 0,
x+1, y, 0);
}
diff --git a/src/mess/drivers/ax20.c b/src/mess/drivers/ax20.c
index 8c250cd5400..5928552f533 100644
--- a/src/mess/drivers/ax20.c
+++ b/src/mess/drivers/ax20.c
@@ -50,7 +50,7 @@ UINT32 ax20_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co
{
UINT16 tile = m_p_vram[24 + y * 128 + x ] & 0x7f;
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, tile, 0, 0, 0, x*8, y*12);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*12);
}
}
diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c
index a43d432d6aa..7ec82efc362 100644
--- a/src/mess/drivers/casloopy.c
+++ b/src/mess/drivers/casloopy.c
@@ -267,7 +267,7 @@ UINT32 casloopy_state::screen_update_casloopy(screen_device &screen, bitmap_ind1
tile &= 0x7ff; //???
- gfx->transpen(m_palette,bitmap,cliprect,tile,7,0,0,x*8,y*8,0xffffffff);
+ gfx->transpen(bitmap,cliprect,tile,7,0,0,x*8,y*8,0xffffffff);
count+=2;
}
diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c
index d5c4b2f06cc..809098cbe2a 100644
--- a/src/mess/drivers/itt3030.c
+++ b/src/mess/drivers/itt3030.c
@@ -362,7 +362,7 @@ UINT32 itt3030_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap
for(int x = 0; x < 80; x++ )
{
UINT8 code = m_vram[x + y*128];
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, x*8,y*16);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, x*8,y*16);
}
}
diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c
index 1fa9c0373fe..7add8866d0c 100644
--- a/src/mess/drivers/multi8.c
+++ b/src/mess/drivers/multi8.c
@@ -183,7 +183,7 @@ UINT32 multi8_state::screen_update_multi8(screen_device &screen, bitmap_ind16 &b
}
}
- // m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, tile,color >> 5, 0, 0, x*8, y*8);
+ // m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile,color >> 5, 0, 0, x*8, y*8);
// draw cursor
if(mc6845_cursor_addr+0xc000 == count)
diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c
index e2380b12abe..c3ace56fea7 100644
--- a/src/mess/drivers/pv1000.c
+++ b/src/mess/drivers/pv1000.c
@@ -358,12 +358,12 @@ UINT32 pv1000_state::screen_update_pv1000(screen_device &screen, bitmap_ind16 &b
if ( tile < 0xe0 || m_force_pattern )
{
tile += ( m_pcg_bank << 8);
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 );
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 );
}
else
{
tile -= 0xe0;
- m_gfxdecode->gfx(1)->opaque(m_palette,bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 );
+ m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 );
}
}
}
diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c
index d67dc4bc91d..b73f69ac2f4 100644
--- a/src/mess/drivers/supracan.c
+++ b/src/mess/drivers/supracan.c
@@ -567,7 +567,7 @@ void supracan_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
//printf("sprite data %04x %04x %04x %04x\n", supracan_vram[i+0] , supracan_vram[i+1] , supracan_vram[i+2] ,supracan_vram[i+3] );
- gfx->transpen(m_palette,bitmap,cliprect,tile,palette,sprite_xflip,sprite_yflip,
+ gfx->transpen(bitmap,cliprect,tile,palette,sprite_xflip,sprite_yflip,
x,
y,
0);
@@ -614,7 +614,7 @@ void supracan_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
int tile_xflip = sprite_xflip ^ ((data & 0x0800)>>11);
int tile_yflip = sprite_yflip ^ ((data & 0x0400)>>10);
- gfx->transpen(m_palette,bitmap,cliprect,tile,palette,tile_xflip,tile_yflip,xpos,ypos,0);
+ gfx->transpen(bitmap,cliprect,tile,palette,tile_xflip,tile_yflip,xpos,ypos,0);
}
}
}
diff --git a/src/mess/drivers/ti99_2.c b/src/mess/drivers/ti99_2.c
index 72485c6e4a1..2fec7a024ff 100644
--- a/src/mess/drivers/ti99_2.c
+++ b/src/mess/drivers/ti99_2.c
@@ -173,7 +173,7 @@ UINT32 ti99_2_state::screen_update_ti99_2(screen_device &screen, bitmap_ind16 &b
for (i = 0; i < 768; i++)
{
/* Is the char code masked or not ??? */
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[i] & 0x7F, 0,
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[i] & 0x7F, 0,
0, 0, sx, sy);
sx += 8;
diff --git a/src/mess/drivers/tk80bs.c b/src/mess/drivers/tk80bs.c
index 39e887964d7..34eef386212 100644
--- a/src/mess/drivers/tk80bs.c
+++ b/src/mess/drivers/tk80bs.c
@@ -71,7 +71,7 @@ UINT32 tk80bs_state::screen_update_tk80bs(screen_device &screen, bitmap_ind16 &b
{
int tile = m_p_videoram[count++];
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, tile, 0, 0, 0, x*8, y*8);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8);
}
}
diff --git a/src/mess/video/733_asr.c b/src/mess/video/733_asr.c
index b400b34c058..20eb5ca08cb 100644
--- a/src/mess/video/733_asr.c
+++ b/src/mess/video/733_asr.c
@@ -209,7 +209,7 @@ void asr733_device::set_interrupt_line()
/* write a single char on screen */
void asr733_device::draw_char(int character, int x, int y, int color)
{
- m_gfxdecode->gfx(0)->opaque(*m_palette, *m_bitmap, m_bitmap->cliprect(), character-32, color, 0, 0, x+1, y);
+ m_gfxdecode->gfx(0)->opaque(*m_bitmap, m_bitmap->cliprect(), character-32, color, 0, 0, x+1, y);
}
void asr733_device::linefeed()
diff --git a/src/mess/video/911_vdt.c b/src/mess/video/911_vdt.c
index 419c8e8d39e..4505ae459e1 100644
--- a/src/mess/video/911_vdt.c
+++ b/src/mess/video/911_vdt.c
@@ -500,7 +500,7 @@ void vdt911_device::refresh(bitmap_ind16 &bitmap, const rectangle &cliprect, int
address++;
- gfx->opaque(*m_palette, bitmap, cliprect, cur_char, color, 0, 0,
+ gfx->opaque(bitmap, cliprect, cur_char, color, 0, 0,
x+j*7, y+i*10);
}
}
diff --git a/src/mess/video/ac1.c b/src/mess/video/ac1.c
index 44353fb920c..fdcf5c58de9 100644
--- a/src/mess/video/ac1.c
+++ b/src/mess/video/ac1.c
@@ -36,7 +36,7 @@ UINT32 ac1_state::screen_update_ac1(screen_device &screen, bitmap_ind16 &bitmap,
for(x = 0; x < 64; x++ )
{
int code = space.read_byte(AC1_VIDEO_MEMORY + x + y*64);
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, 63*6-x*6,15*8-y*8);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, 63*6-x*6,15*8-y*8);
}
}
return 0;
@@ -52,7 +52,7 @@ UINT32 ac1_state::screen_update_ac1_32(screen_device &screen, bitmap_ind16 &bitm
for(x = 0; x < 64; x++ )
{
int code = space.read_byte(AC1_VIDEO_MEMORY + x + y*64);
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, 63*6-x*6,31*8-y*8);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, 63*6-x*6,31*8-y*8);
}
}
return 0;
diff --git a/src/mess/video/arcadia.c b/src/mess/video/arcadia.c
index 47e2f17f307..7889b150afd 100644
--- a/src/mess/video/arcadia.c
+++ b/src/mess/video/arcadia.c
@@ -453,8 +453,8 @@ void arcadia_state::arcadia_draw_char(UINT8 *ch, int charcode, int y, int x)
{
m_bg[y+1][x>>3]|=b>>(x&7);
m_bg[y+1][(x>>3)+1]|=b<<(8-(x&7));
- m_gfxdecode->gfx(0)->opaque(m_palette,*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y);
- m_gfxdecode->gfx(0)->opaque(m_palette,*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y+1);
+ m_gfxdecode->gfx(0)->opaque(*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y);
+ m_gfxdecode->gfx(0)->opaque(*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y+1);
}
}
}
@@ -466,7 +466,7 @@ void arcadia_state::arcadia_draw_char(UINT8 *ch, int charcode, int y, int x)
m_bg[y][x>>3]|=b>>(x&7);
m_bg[y][(x>>3)+1]|=b<<(8-(x&7));
- m_gfxdecode->gfx(0)->opaque(m_palette,*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y);
+ m_gfxdecode->gfx(0)->opaque(*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y);
}
}
}
diff --git a/src/mess/video/cgenie.c b/src/mess/video/cgenie.c
index 2999ec7f1c3..6a733bac327 100644
--- a/src/mess/video/cgenie.c
+++ b/src/mess/video/cgenie.c
@@ -261,7 +261,7 @@ void cgenie_state::cgenie_refresh_monitor(bitmap_ind16 &bitmap, const rectangle
{
/* get graphics code */
code = videoram[i];
- m_gfxdecode->gfx(1)->opaque(m_palette,bitmap,r, code, 0,
+ m_gfxdecode->gfx(1)->opaque(bitmap,r, code, 0,
0, 0, r.min_x, r.min_y);
}
else
@@ -271,7 +271,7 @@ void cgenie_state::cgenie_refresh_monitor(bitmap_ind16 &bitmap, const rectangle
/* translate defined character sets */
code += m_font_offset[(code >> 6) & 3];
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,r, code, m_colorram[i&0x3ff],
+ m_gfxdecode->gfx(0)->opaque(bitmap,r, code, m_colorram[i&0x3ff],
0, 0, r.min_x, r.min_y);
}
@@ -300,7 +300,7 @@ void cgenie_state::cgenie_refresh_monitor(bitmap_ind16 &bitmap, const rectangle
rc.max_x = r.max_x;
rc.min_y = r.min_y + (m_crt.cursor_top & 15);
rc.max_y = r.min_y + (m_crt.cursor_bottom & 15);
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,rc, 0x7f, m_colorram[i&0x3ff],
+ m_gfxdecode->gfx(0)->opaque(bitmap,rc, 0x7f, m_colorram[i&0x3ff],
0, 0, rc.min_x, rc.min_y);
}
}
@@ -341,9 +341,9 @@ void cgenie_state::cgenie_refresh_tv_set(bitmap_ind16 &bitmap, const rectangle &
{
/* get graphics code */
code = videoram[i];
- m_gfxdecode->gfx(1)->opaque(m_palette,m_bitmap,r, code, 1,
+ m_gfxdecode->gfx(1)->opaque(m_bitmap,r, code, 1,
0, 0, r.min_x, r.min_y);
- m_gfxdecode->gfx(1)->opaque(m_palette,m_dlybitmap,r, code, 2,
+ m_gfxdecode->gfx(1)->opaque(m_dlybitmap,r, code, 2,
0, 0, r.min_x, r.min_y);
}
else
@@ -353,9 +353,9 @@ void cgenie_state::cgenie_refresh_tv_set(bitmap_ind16 &bitmap, const rectangle &
/* translate defined character sets */
code += m_font_offset[(code >> 6) & 3];
- m_gfxdecode->gfx(0)->opaque(m_palette,m_bitmap,r, code, m_colorram[i&0x3ff] + 16,
+ m_gfxdecode->gfx(0)->opaque(m_bitmap,r, code, m_colorram[i&0x3ff] + 16,
0, 0, r.min_x, r.min_y);
- m_gfxdecode->gfx(0)->opaque(m_palette,m_dlybitmap,r, code, m_colorram[i&0x3ff] + 32,
+ m_gfxdecode->gfx(0)->opaque(m_dlybitmap,r, code, m_colorram[i&0x3ff] + 32,
0, 0, r.min_x, r.min_y);
}
@@ -385,9 +385,9 @@ void cgenie_state::cgenie_refresh_tv_set(bitmap_ind16 &bitmap, const rectangle &
rc.min_y = r.min_y + (m_crt.cursor_top & 15);
rc.max_y = r.min_y + (m_crt.cursor_bottom & 15);
- m_gfxdecode->gfx(0)->opaque(m_palette,m_bitmap,rc, 0x7f, m_colorram[i&0x3ff] + 16,
+ m_gfxdecode->gfx(0)->opaque(m_bitmap,rc, 0x7f, m_colorram[i&0x3ff] + 16,
0, 0, rc.min_x, rc.min_y);
- m_gfxdecode->gfx(0)->opaque(m_palette,m_dlybitmap,rc, 0x7f, m_colorram[i&0x3ff] + 32,
+ m_gfxdecode->gfx(0)->opaque(m_dlybitmap,rc, 0x7f, m_colorram[i&0x3ff] + 32,
0, 0, rc.min_x, rc.min_y);
}
}
diff --git a/src/mess/video/comquest.c b/src/mess/video/comquest.c
index cf42088b7d3..6160e845795 100644
--- a/src/mess/video/comquest.c
+++ b/src/mess/video/comquest.c
@@ -13,7 +13,7 @@ UINT32 comquest_state::screen_update_comquest(screen_device &screen, bitmap_ind1
for (y=0; y<128;y++) {
for (x=0, j=0; j<8;j++,x+=8*4) {
#if 0
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,0, state->m_data[y][j],0,
+ m_gfxdecode->gfx(0)->opaque(bitmap,0, state->m_data[y][j],0,
0,0,x,y);
#endif
}
diff --git a/src/mess/video/galeb.c b/src/mess/video/galeb.c
index 6fb96ebcd84..576036491b4 100644
--- a/src/mess/video/galeb.c
+++ b/src/mess/video/galeb.c
@@ -36,7 +36,7 @@ UINT32 galeb_state::screen_update_galeb(screen_device &screen, bitmap_ind16 &bit
for(x = 0; x < 48; x++ )
{
int code = m_video_ram[15 + x + y*64];
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, x*8,y*8);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, x*8,y*8);
}
}
return 0;
diff --git a/src/mess/video/intv.c b/src/mess/video/intv.c
index 889807462a9..cd418092c03 100644
--- a/src/mess/video/intv.c
+++ b/src/mess/video/intv.c
@@ -83,7 +83,7 @@ UINT32 intv_state::screen_update_intvkbd(screen_device &screen, bitmap_ind16 &bi
{
offs = current_row*64+x;
- m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,
+ m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,
videoram[offs],
7, /* white */
0,0,
@@ -94,7 +94,7 @@ UINT32 intv_state::screen_update_intvkbd(screen_device &screen, bitmap_ind16 &bi
/* draw the cursor as a solid white block */
/* (should use a filled rect here!) */
- m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,
+ m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,
191, /* a block */
7, /* white */
0,0,
@@ -107,25 +107,25 @@ UINT32 intv_state::screen_update_intvkbd(screen_device &screen, bitmap_ind16 &bi
#if 0
// debugging
c = tape_motor_mode_desc[m_tape_motor_mode][0];
- m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(0)->transpen(bitmap,&machine().screen[0].visarea,
c,
1,
0,0,
0*8,0*8, 0);
for(y=0;y<5;y++)
{
- m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(0)->transpen(bitmap,&machine().screen[0].visarea,
m_tape_unknown_write[y]+'0',
1,
0,0,
0*8,(y+2)*8, 0);
}
- m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(0)->transpen(bitmap,&machine().screen[0].visarea,
m_tape_unknown_write[5]+'0',
1,
0,0,
0*8,8*8, 0);
- m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(0)->transpen(bitmap,&machine().screen[0].visarea,
m_tape_interrupts_enabled+'0',
1,
0,0,
diff --git a/src/mess/video/kramermc.c b/src/mess/video/kramermc.c
index 65df531d75c..dfedb9c59ba 100644
--- a/src/mess/video/kramermc.c
+++ b/src/mess/video/kramermc.c
@@ -37,7 +37,7 @@ UINT32 kramermc_state::screen_update_kramermc(screen_device &screen, bitmap_ind1
for(x = 0; x < 64; x++ )
{
int code = space.read_byte(KRAMERMC_VIDEO_MEMORY + x + y*64);
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, x*8,y*8);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, x*8,y*8);
}
}
return 0;
diff --git a/src/mess/video/mz700.c b/src/mess/video/mz700.c
index a006a36aac1..57518738997 100644
--- a/src/mess/video/mz700.c
+++ b/src/mess/video/mz700.c
@@ -60,7 +60,7 @@ UINT32 mz_state::screen_update_mz700(screen_device &screen, bitmap_ind16 &bitmap
color = m_colorram[offs];
code = videoram[offs] | (color & 0x80) << 1;
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code, color, 0, 0, sx, sy);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code, color, 0, 0, sx, sy);
}
return 0;
diff --git a/src/mess/video/nascom1.c b/src/mess/video/nascom1.c
index 31099f5e6ed..1a2356d3654 100644
--- a/src/mess/video/nascom1.c
+++ b/src/mess/video/nascom1.c
@@ -17,7 +17,7 @@ UINT32 nascom1_state::screen_update_nascom1(screen_device &screen, bitmap_ind16
for (sx = 0; sx < 48; sx++)
{
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[0x03ca + sx],
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x03ca + sx],
1, 0, 0, sx * 8, 0);
}
@@ -26,7 +26,7 @@ UINT32 nascom1_state::screen_update_nascom1(screen_device &screen, bitmap_ind16
for (sx = 0; sx < 48; sx++)
{
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[0x000a + (sy * 64) + sx],
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x000a + (sy * 64) + sx],
1, 0, 0, sx * 8, (sy + 1) * 16);
}
}
@@ -41,7 +41,7 @@ UINT32 nascom1_state::screen_update_nascom2(screen_device &screen, bitmap_ind16
for (sx = 0; sx < 48; sx++)
{
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[0x03ca + sx],
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x03ca + sx],
1, 0, 0, sx * 8, 0);
}
@@ -50,7 +50,7 @@ UINT32 nascom1_state::screen_update_nascom2(screen_device &screen, bitmap_ind16
for (sx = 0; sx < 48; sx++)
{
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[0x000a + (sy * 64) + sx],
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x000a + (sy * 64) + sx],
1, 0, 0, sx * 8, (sy + 1) * 14);
}
}
diff --git a/src/mess/video/p2000m.c b/src/mess/video/p2000m.c
index 0c0b6030bc2..8b8ead9aab6 100644
--- a/src/mess/video/p2000m.c
+++ b/src/mess/video/p2000m.c
@@ -41,7 +41,7 @@ UINT32 p2000t_state::screen_update_p2000m(screen_device &screen, bitmap_ind16 &b
if (code < 32) code = 32;
}
- m_gfxdecode->gfx(0)->zoom_opaque(m_palette,bitmap,cliprect, code,
+ m_gfxdecode->gfx(0)->zoom_opaque(bitmap,cliprect, code,
videoram[offs + 2048] & 0x08 ? 0 : 1, 0, 0, sx, sy, 0x20000, 0x20000);
if (videoram[offs] & 0x80)
diff --git a/src/mess/video/pc1251.c b/src/mess/video/pc1251.c
index e8dce7f3b85..1bf93ac97bd 100644
--- a/src/mess/video/pc1251.c
+++ b/src/mess/video/pc1251.c
@@ -125,14 +125,14 @@ UINT32 pc1251_state::screen_update_pc1251(screen_device &screen, bitmap_ind16 &b
for (x=RIGHT,y=DOWN, i=0; i<60; x+=3)
{
for (j=0; j<5; j++, i++, x+=3)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],
PC1251_CONTRAST,0,0,
x,y);
}
for (i=0x7b; i>=0x40; x+=3)
{
for (j=0; j<5; j++, i--, x+=3)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],
PC1251_CONTRAST,0,0,
x,y);
}
diff --git a/src/mess/video/pc1401.c b/src/mess/video/pc1401.c
index 24f828bd6f7..4a8f088f1e4 100644
--- a/src/mess/video/pc1401.c
+++ b/src/mess/video/pc1401.c
@@ -148,12 +148,12 @@ UINT32 pc1401_state::screen_update_pc1401(screen_device &screen, bitmap_ind16 &b
for (x=RIGHT,y=DOWN,i=0; i<0x28;x+=2)
{
for (j=0; j<5;j++,i++,x+=2)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,x,y);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,x,y);
}
for (i=0x67; i>=0x40;x+=2)
{
for (j=0; j<5;j++,i--,x+=2)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,x,y);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,x,y);
}
}
diff --git a/src/mess/video/pc1403.c b/src/mess/video/pc1403.c
index a9eea82370b..999f6a76b17 100644
--- a/src/mess/video/pc1403.c
+++ b/src/mess/video/pc1403.c
@@ -159,37 +159,37 @@ UINT32 pc1403_state::screen_update_pc1403(screen_device &screen, bitmap_ind16 &b
{
for (x=m_RIGHT, y=m_DOWN, i=0; i<6*5; x+=2) {
for (j=0; j<5; j++, i++, x+=2)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,
x,y);
}
for (i=9*5; i<12*5; x+=2)
{
for (j=0; j<5; j++, i++, x+=2)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,
x,y);
}
for (i=6*5; i<9*5; x+=2)
{
for (j=0; j<5; j++, i++, x+=2)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,
x,y);
}
for (i=0x7b-3*5; i>0x7b-6*5; x+=2)
{
for (j=0; j<5; j++, i--, x+=2)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,
x,y);
}
for (i=0x7b; i>0x7b-3*5; x+=2)
{
for (j=0; j<5; j++, i--, x+=2)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,
x,y);
}
for (i=0x7b-6*5; i>0x7b-12*5; x+=2)
{
for (j=0; j<5; j++, i--, x+=2)
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,
x,y);
}
}
diff --git a/src/mess/video/pdp1.c b/src/mess/video/pdp1.c
index 4215d6325b2..a32523b0fae 100644
--- a/src/mess/video/pdp1.c
+++ b/src/mess/video/pdp1.c
@@ -220,7 +220,7 @@ void pdp1_state::pdp1_draw_multipleswitch(bitmap_ind16 &bitmap, int x, int y, in
/* write a single char on screen */
void pdp1_state::pdp1_draw_char(bitmap_ind16 &bitmap, char character, int x, int y, int color)
{
- m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,bitmap.cliprect(), character-32, color, 0, 0,
+ m_gfxdecode->gfx(0)->transpen(bitmap,bitmap.cliprect(), character-32, color, 0, 0,
x+1, y, 0);
}
diff --git a/src/mess/video/stic.c b/src/mess/video/stic.c
index 5cf9488d2af..2e0f572fc29 100644
--- a/src/mess/video/stic.c
+++ b/src/mess/video/stic.c
@@ -677,7 +677,7 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
m_gramdirtybytes[code] = 0;
}
// Draw GRAM char
- m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(1)->zoom_transpen(bitmap,&machine().screen[0].visarea,
code,
s->color,
s->xflip,s->yflip,
@@ -700,13 +700,13 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
m_gramdirtybytes[code+1] = 0;
}
// Draw GRAM char
- m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(1)->zoom_transpen(bitmap,&machine().screen[0].visarea,
code,
s->color,
s->xflip,s->yflip,
(s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT,
0x8000*s->xsize, 0x8000*s->ysize,0);
- m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(1)->zoom_transpen(bitmap,&machine().screen[0].visarea,
code+1,
s->color,
s->xflip,s->yflip,
@@ -719,7 +719,7 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
if (s->yres == 1)
{
// Draw GROM char
- m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(0)->zoom_transpen(bitmap,&machine().screen[0].visarea,
code,
s->color,
s->xflip,s->yflip,
@@ -728,13 +728,13 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
}
else
{
- m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(0)->zoom_transpen(bitmap,&machine().screen[0].visarea,
code,
s->color,
s->xflip,s->yflip,
(s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT,
0x8000*s->xsize, 0x8000*s->ysize,0);
- m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea,
+ m_gfxdecode->gfx(0)->zoom_transpen(bitmap,&machine().screen[0].visarea,
code+1,
s->color,
s->xflip,s->yflip,
diff --git a/src/mess/video/tx0.c b/src/mess/video/tx0.c
index ea9efd84dd8..93d29e29378 100644
--- a/src/mess/video/tx0.c
+++ b/src/mess/video/tx0.c
@@ -197,7 +197,7 @@ void tx0_state::tx0_draw_multipleswitch(bitmap_ind16 &bitmap, int x, int y, int
/* write a single char on screen */
void tx0_state::tx0_draw_char(bitmap_ind16 &bitmap, char character, int x, int y, int color)
{
- m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,bitmap.cliprect(), character-32, color, 0, 0,
+ m_gfxdecode->gfx(0)->transpen(bitmap,bitmap.cliprect(), character-32, color, 0, 0,
x+1, y, 0);
}
diff --git a/src/mess/video/ut88.c b/src/mess/video/ut88.c
index 4f796cfe53f..34f9b41c3a3 100644
--- a/src/mess/video/ut88.c
+++ b/src/mess/video/ut88.c
@@ -35,7 +35,7 @@ UINT32 ut88_state::screen_update_ut88(screen_device &screen, bitmap_ind16 &bitma
{
int code = m_p_videoram[ x + y*64 ] & 0x7f;
int attr = m_p_videoram[ x+1 + y*64 ] & 0x80;
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code | attr, 0, 0,0, x*8,y*8);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code | attr, 0, 0,0, x*8,y*8);
}
}
return 0;
diff --git a/src/mess/video/vtech2.c b/src/mess/video/vtech2.c
index d171c044e26..2173973717d 100644
--- a/src/mess/video/vtech2.c
+++ b/src/mess/video/vtech2.c
@@ -142,7 +142,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi
sy = BORDER_V/2 + y;
sx = BORDER_H/2 + x * 8;
code = videoram[offs];
- m_gfxdecode->gfx(2)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy);
+ m_gfxdecode->gfx(2)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
}
}
break;
@@ -162,7 +162,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi
sx = BORDER_H/2 + x * 16;
code = videoram[offs];
color = videoram[offs+1];
- m_gfxdecode->gfx(3)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy);
+ m_gfxdecode->gfx(3)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
}
}
break;
@@ -181,7 +181,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi
sy = BORDER_V/2 + y;
sx = BORDER_H/2 + x * 8;
code = videoram[offs];
- m_gfxdecode->gfx(5)->opaque(m_palette,bitmap,cliprect,code,0,0,0,sx,sy);
+ m_gfxdecode->gfx(5)->opaque(bitmap,cliprect,code,0,0,0,sx,sy);
}
}
break;
@@ -201,7 +201,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi
sy = BORDER_V/2 + y * 2;
sx = BORDER_H/2 + x * 8;
code = videoram[offs];
- m_gfxdecode->gfx(6)->opaque(m_palette,bitmap,cliprect,code,0,0,0,sx,sy);
+ m_gfxdecode->gfx(6)->opaque(bitmap,cliprect,code,0,0,0,sx,sy);
}
}
break;
@@ -220,7 +220,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi
sy = BORDER_V/2 + y;
sx = BORDER_H/2 + x * 16;
code = videoram[offs];
- m_gfxdecode->gfx(3)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy);
+ m_gfxdecode->gfx(3)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
}
}
break;
@@ -240,7 +240,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi
sx = BORDER_H/2 + x * 32;
code = videoram[offs];
color = videoram[offs+1];
- m_gfxdecode->gfx(4)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy);
+ m_gfxdecode->gfx(4)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
}
}
break;
@@ -261,7 +261,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi
sy = BORDER_V/2 + y * 8;
sx = BORDER_H/2 + x * 8;
code = videoram[0x3800+offs];
- m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy);
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
}
}
}
@@ -278,7 +278,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi
sx = BORDER_H/2 + x * 16;
code = videoram[0x3800+offs];
color = videoram[0x3801+offs];
- m_gfxdecode->gfx(1)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy);
+ m_gfxdecode->gfx(1)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
}
}
}
diff --git a/src/mess/video/x68k.c b/src/mess/video/x68k.c
index 8ff6ae7240f..26c2820fd91 100644
--- a/src/mess/video/x68k.c
+++ b/src/mess/video/x68k.c
@@ -1011,7 +1011,7 @@ void x68k_state::x68k_draw_sprites(bitmap_ind16 &bitmap, int priority, rectangle
sx += m_crtc.bg_hshift;
sx += m_sprite_shift;
- m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,cliprect,code,colour+0x10,xflip,yflip,m_crtc.hbegin+sx,m_crtc.vbegin+(sy*m_crtc.bg_double),0x10000,0x10000*m_crtc.bg_double,0x00);
+ m_gfxdecode->gfx(1)->zoom_transpen(bitmap,cliprect,code,colour+0x10,xflip,yflip,m_crtc.hbegin+sx,m_crtc.vbegin+(sy*m_crtc.bg_double),0x10000,0x10000*m_crtc.bg_double,0x00);
}
}
}