From e9b683647746aef290d62a5b611b260cda936c74 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 26 Feb 2014 15:28:45 +0000 Subject: [PATCH] removed space before m_gfxdecode in main trunk(nw) --- src/mame/drivers/ace.c | 8 ++++---- src/mame/drivers/acefruit.c | 2 +- src/mame/drivers/albazc.c | 2 +- src/mame/drivers/astrcorp.c | 2 +- src/mame/drivers/calorie.c | 4 ++-- src/mame/drivers/cball.c | 2 +- src/mame/drivers/chanbara.c | 10 +++++----- src/mame/drivers/cntsteer.c | 20 ++++++++++---------- src/mame/drivers/dacholer.c | 2 +- src/mame/drivers/ddayjlc.c | 6 +++--- src/mame/drivers/destroyr.c | 8 ++++---- src/mame/drivers/discoboy.c | 2 +- src/mame/drivers/dlair.c | 2 +- src/mame/drivers/dwarfd.c | 2 +- src/mame/drivers/esh.c | 2 +- src/mame/drivers/firefox.c | 2 +- src/mame/drivers/flyball.c | 2 +- src/mame/drivers/go2000.c | 4 ++-- src/mame/drivers/gpworld.c | 2 +- src/mame/drivers/istellar.c | 2 +- src/mame/drivers/jclub2.c | 2 +- src/mame/drivers/lbeach.c | 4 ++-- src/mame/drivers/lgp.c | 2 +- src/mame/drivers/marinedt.c | 4 ++-- src/mame/drivers/mgolf.c | 4 ++-- src/mame/drivers/midas.c | 2 +- src/mame/drivers/norautp.c | 4 ++-- src/mame/drivers/pzletime.c | 2 +- src/mame/drivers/sbrkout.c | 2 +- src/mame/drivers/seabattl.c | 4 ++-- src/mame/drivers/segald.c | 2 +- src/mame/drivers/sigmab98.c | 2 +- src/mame/drivers/supdrapo.c | 2 +- src/mame/drivers/vroulet.c | 2 +- src/mame/video/1943.c | 4 ++-- src/mame/video/aeroboto.c | 2 +- src/mame/video/alpha68k.c | 4 ++-- src/mame/video/atarifb.c | 6 +++--- src/mame/video/bigevglf.c | 2 +- src/mame/video/bking.c | 10 +++++----- src/mame/video/blueprnt.c | 2 +- src/mame/video/bsktball.c | 2 +- src/mame/video/btime.c | 4 ++-- src/mame/video/buggychl.c | 2 +- src/mame/video/carjmbre.c | 2 +- src/mame/video/ccastles.c | 2 +- src/mame/video/centiped.c | 8 ++++---- src/mame/video/citycon.c | 2 +- src/mame/video/cloak.c | 2 +- src/mame/video/cloud9.c | 4 ++-- src/mame/video/commando.c | 2 +- src/mame/video/cvs.c | 4 ++-- src/mame/video/decocass.c | 12 ++++++------ src/mame/video/dkong.c | 6 +++--- src/mame/video/equites.c | 2 +- src/mame/video/exerion.c | 2 +- src/mame/video/exidy.c | 10 +++++----- src/mame/video/exprraid.c | 4 ++-- src/mame/video/exzisus.c | 4 ++-- src/mame/video/fcombat.c | 2 +- src/mame/video/fgoal.c | 8 ++++---- src/mame/video/funkybee.c | 2 +- src/mame/video/funybubl.c | 4 ++-- src/mame/video/galaxold.c | 2 +- src/mame/video/gberet.c | 4 ++-- src/mame/video/gunsmoke.c | 2 +- src/mame/video/himesiki.c | 4 ++-- src/mame/video/homerun.c | 4 ++-- src/mame/video/ikki.c | 2 +- src/mame/video/jailbrek.c | 2 +- src/mame/video/karnov.c | 4 ++-- src/mame/video/kchamp.c | 4 ++-- src/mame/video/kingobox.c | 4 ++-- src/mame/video/lasso.c | 2 +- src/mame/video/lordgun.c | 2 +- src/mame/video/m52.c | 2 +- src/mame/video/m57.c | 2 +- src/mame/video/madalien.c | 4 ++-- src/mame/video/magmax.c | 4 ++-- src/mame/video/malzak.c | 2 +- src/mame/video/matmania.c | 10 +++++----- src/mame/video/meadows.c | 2 +- src/mame/video/megazone.c | 4 ++-- src/mame/video/mermaid.c | 16 ++++++++-------- src/mame/video/mrdo.c | 2 +- src/mame/video/mrjong.c | 2 +- src/mame/video/nycaptor.c | 4 ++-- src/mame/video/orbit.c | 2 +- src/mame/video/pktgaldx.c | 6 +++--- src/mame/video/polyplay.c | 2 +- src/mame/video/poolshrk.c | 2 +- src/mame/video/popper.c | 2 +- src/mame/video/prehisle.c | 2 +- src/mame/video/renegade.c | 4 ++-- src/mame/video/rocnrope.c | 2 +- src/mame/video/rpunch.c | 2 +- src/mame/video/runaway.c | 8 ++++---- src/mame/video/sauro.c | 2 +- src/mame/video/scotrsht.c | 2 +- src/mame/video/segag80r.c | 2 +- src/mame/video/sf.c | 10 +++++----- src/mame/video/skyraid.c | 6 +++--- src/mame/video/snk68.c | 2 +- src/mame/video/sonson.c | 4 ++-- src/mame/video/sprint2.c | 8 ++++---- src/mame/video/sprint4.c | 4 ++-- src/mame/video/sprint8.c | 2 +- src/mame/video/st0020.c | 2 +- src/mame/video/starshp1.c | 4 ++-- src/mame/video/suna8.c | 2 +- src/mame/video/superqix.c | 4 ++-- src/mame/video/suprridr.c | 2 +- src/mame/video/taito_b.c | 2 +- src/mame/video/tank8.c | 2 +- src/mame/video/tehkanwc.c | 2 +- src/mame/video/tiamc1.c | 2 +- src/mame/video/tp84.c | 2 +- src/mame/video/travrusa.c | 2 +- src/mame/video/triplhnt.c | 2 +- src/mame/video/ultratnk.c | 4 ++-- src/mame/video/videopin.c | 2 +- src/mame/video/wc90.c | 2 +- src/mame/video/xorworld.c | 2 +- src/mame/video/zac2650.c | 10 +++++----- src/mame/video/zodiack.c | 2 +- src/mess/drivers/apexc.c | 2 +- src/mess/drivers/ax20.c | 2 +- src/mess/drivers/itt3030.c | 4 ++-- src/mess/drivers/pv1000.c | 4 ++-- src/mess/drivers/ti99_2.c | 2 +- src/mess/drivers/tk80bs.c | 2 +- src/mess/video/ac1.c | 4 ++-- src/mess/video/arcadia.c | 6 +++--- src/mess/video/cgenie.c | 18 +++++++++--------- src/mess/video/comquest.c | 2 +- src/mess/video/galeb.c | 2 +- src/mess/video/intv.c | 8 ++++---- src/mess/video/kramermc.c | 2 +- src/mess/video/mz700.c | 2 +- src/mess/video/p2000m.c | 2 +- src/mess/video/pc1251.c | 4 ++-- src/mess/video/pc1401.c | 4 ++-- src/mess/video/pc1403.c | 12 ++++++------ src/mess/video/pdp1.c | 2 +- src/mess/video/tx0.c | 2 +- src/mess/video/ut88.c | 2 +- 146 files changed, 273 insertions(+), 273 deletions(-) diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index a0fcb79373e..f786ef4e229 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -98,19 +98,19 @@ UINT32 aceal_state::screen_update_ace(screen_device &screen, bitmap_ind16 &bitma /* first of all, fill the screen with the background color */ bitmap.fill(0, cliprect); - m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, 0, 0, 0, 0, m_objpos[0], m_objpos[1]); - m_gfxdecode->gfx(2)->opaque(bitmap,cliprect, + m_gfxdecode->gfx(2)->opaque(bitmap,cliprect, 0, 0, 0, 0, m_objpos[2], m_objpos[3]); - m_gfxdecode->gfx(3)->opaque(bitmap,cliprect, + m_gfxdecode->gfx(3)->opaque(bitmap,cliprect, 0, 0, 0, 0, @@ -118,7 +118,7 @@ UINT32 aceal_state::screen_update_ace(screen_device &screen, bitmap_ind16 &bitma for (offs = 0; offs < 8; offs++) { - m_gfxdecode->gfx(4)->opaque(bitmap,/* ?? */ + m_gfxdecode->gfx(4)->opaque(bitmap,/* ?? */ cliprect, offs, 0, diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index 2088ead53ef..8cc4ee383cb 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -130,7 +130,7 @@ UINT32 acefruit_state::screen_update_acefruit(screen_device &screen, bitmap_ind1 if( color < 0x4 ) { - m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, code, color, 0, 0, col * 16, row * 8 ); + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, code, color, 0, 0, col * 16, row * 8 ); } else if( color >= 0x5 && color <= 0x7 ) { diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index db066a0dd0d..1dee14b5338 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -87,7 +87,7 @@ void albazc_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx, flipy, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); } } diff --git a/src/mame/drivers/astrcorp.c b/src/mame/drivers/astrcorp.c index 379b218c040..30b99cef54f 100644 --- a/src/mame/drivers/astrcorp.c +++ b/src/mame/drivers/astrcorp.c @@ -149,7 +149,7 @@ void astrocorp_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clipre { for (xwrap = 0 ; xwrap <= 0x200 ; xwrap += 0x200) { - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, 0, 0, 0, sx + x * 16 - xwrap, sy + y * 16 - ywrap, 0xff); diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index cfbd8850679..3e3c26a7b2f 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -195,12 +195,12 @@ UINT32 calorie_state::screen_update_calorie(screen_device &screen, bitmap_ind16 if (m_sprites[x + 1] & 0x10) { /* 32x32 sprites */ - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, tileno | 0x40, color, flipx, flipy, xpos, ypos - 31, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, tileno | 0x40, color, flipx, flipy, xpos, ypos - 31, 0); } else { /* 16x16 sprites */ - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, tileno, color, flipx, flipy, xpos, ypos - 15, 0); + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, tileno, color, flipx, flipy, xpos, ypos - 15, 0); } } return 0; diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index abbe4e19503..2845eba7c33 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -76,7 +76,7 @@ UINT32 cball_state::screen_update_cball(screen_device &screen, bitmap_ind16 &bit m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); /* draw sprite */ - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_video_ram[0x399] >> 4, 0, 0, 0, diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index 7899f67ca2a..cffb5b68f8e 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -191,18 +191,18 @@ void chanbara_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre { if (!flipy) { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy-16, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code+1, color, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy-16, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code+1, color, flipx, flipy, sx, sy, 0); } else { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code+1, color, flipx, flipy, sx, sy-16, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code+1, color, flipx, flipy, sx, sy-16, 0); } } else { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); } } } diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 9ecdb26dbaf..9d2b474711c 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -217,17 +217,17 @@ void cntsteer_state::zerotrgt_draw_sprites( bitmap_ind16 &bitmap, const rectangl { if (fy) { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, fx, fy, sx, sy - 16, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, fx, fy, sx, sy - 16, 0); } else { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy - 16, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, fx, fy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy - 16, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, fx, fy, sx, sy, 0); } } else - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy, 0); } } @@ -274,17 +274,17 @@ void cntsteer_state::cntsteer_draw_sprites( bitmap_ind16 &bitmap, const rectangl { if (fy) { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, fx, fy, sx, sy - 16, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, fx, fy, sx, sy - 16, 0); } else { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy - 16, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, fx, fy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy - 16, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, fx, fy, sx, sy, 0); } } else - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy, 0); } } diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index afb4a96b508..7acfb5985f9 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -151,7 +151,7 @@ void dacholer_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, 0, flipx,flipy, diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 5cbea4f8a2a..bc812dbfc8f 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -408,7 +408,7 @@ UINT32 ddayjlc_state::screen_update_ddayjlc(screen_device &screen, bitmap_ind16 code = (code & 0x7f) | ((flags & 0x30) << 3); - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, xflip, yflip, x, y, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, xflip, yflip, x, y, 0); } { @@ -419,9 +419,9 @@ UINT32 ddayjlc_state::screen_update_ddayjlc(screen_device &screen, bitmap_ind16 { c = m_videoram[y * 32 + x]; if (x > 1 && x < 30) - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, c + m_char_bank * 0x100, 2, 0, 0, x*8, y*8, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, c + m_char_bank * 0x100, 2, 0, 0, x*8, y*8, 0); else - m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, c + m_char_bank * 0x100, 2, 0, 0, x*8, y*8); + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, c + m_char_bank * 0x100, 2, 0, 0, x*8, y*8); } } return 0; diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index e06c45fc668..e4ecb5d18ae 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -98,7 +98,7 @@ UINT32 destroyr_state::screen_update_destroyr(screen_device &screen, bitmap_ind1 continue; } - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, num, 0, flipx, 0, horz, 16 * i, 0); + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, num, 0, flipx, 0, horz, 16 * i, 0); } /* draw alpha numerics */ @@ -108,7 +108,7 @@ UINT32 destroyr_state::screen_update_destroyr(screen_device &screen, bitmap_ind1 { int num = m_alpha_num_ram[32 * i + j]; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, num, 0, 0, 0, 8 * j, 8 * i, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, num, 0, 0, 0, 8 * j, 8 * i, 0); } } @@ -119,13 +119,13 @@ UINT32 destroyr_state::screen_update_destroyr(screen_device &screen, bitmap_ind1 int horz = 256 - m_minor_obj_ram[i + 2]; int vert = 256 - m_minor_obj_ram[i + 4]; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, num, 0, 0, 0, horz, vert, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, num, 0, 0, 0, horz, vert, 0); } /* draw waves */ for (i = 0; i < 4; i++) { - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, m_wavemod ? 1 : 0, 0, 0, 0, 64 * i, 0x4e, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, m_wavemod ? 1 : 0, 0, 0, 0, 64 * i, 0x4e, 0); } /* draw cursor */ diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 70c8d783229..e2befa673a7 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -200,7 +200,7 @@ UINT32 discoboy_state::screen_update_discoboy(screen_device &screen, bitmap_ind1 tileno = 0x2000 + (tileno & 0x1fff) + 0x0000; } - m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, tileno, m_ram_att[count / 2], 0, 0, x*8, y*8); + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, tileno, m_ram_att[count / 2], 0, 0, x*8, y*8); count += 2; } } diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index b27f3b04074..50b2876b06e 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -256,7 +256,7 @@ UINT32 dlair_state::screen_update_dleuro(screen_device &screen, bitmap_ind16 &bi for (x = 0; x < 32; x++) { UINT8 *base = &videoram[y * 64 + x * 2 + 1]; - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, base[0], base[1], 0, 0, 10 * x, 16 * y); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, base[0], base[1], 0, 0, 10 * x, 16 * y); } return 0; diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 890be89c016..0a91dc745d6 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -837,7 +837,7 @@ void dwarfd_state::drawCrt( bitmap_rgb32 &bitmap,const rectangle &cliprect ) else b = 1; } - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile + (m_bank + bank2) * 128, 0, 0, 0, diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index 53fb01981cd..391e4309b6b 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -90,7 +90,7 @@ UINT32 esh_state::screen_update_esh(screen_device &screen, bitmap_rgb32 &bitmap, //int blinkLine = (m_tile_control_ram[current_screen_character] & 0x40) >> 6; //int blinkChar = (m_tile_control_ram[current_screen_character] & 0x80) >> 7; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_tile_ram[current_screen_character] + (0x100 * tileOffs), palIndex, 0, 0, charx*8, chary*8, 0); diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 2e467115728..a2f24f98a14 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -249,7 +249,7 @@ UINT32 firefox_state::screen_update_firefox(screen_device &screen, bitmap_rgb32 int flipx = flags & 0x20; int code = sprite_data[ 15 - row ] + ( 256 * ( ( flags >> 6 ) & 3 ) ); - m_gfxdecode->gfx( 1 )->transpen(bitmap,cliprect, code, color, flipx, flipy, x + 8, gfxtop + 500 - y - ( row * 16 ), 0 ); + m_gfxdecode->gfx( 1 )->transpen(bitmap,cliprect, code, color, flipx, flipy, x + 8, gfxtop + 500 - y - ( row * 16 ), 0 ); } } } diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 8b68061b8e2..3f6807149e0 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -132,7 +132,7 @@ UINT32 flyball_state::screen_update_flyball(screen_device &screen, bitmap_ind16 m_tmap->draw(screen, bitmap, cliprect, 0, 0); /* draw pitcher */ - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_pitcher_pic ^ 0xf, 0, 1, 0, pitcherx, pitchery, 1); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_pitcher_pic ^ 0xf, 0, 1, 0, pitcherx, pitchery, 1); /* draw ball */ diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index ea216336d2f..fe8cb2c6854 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -191,7 +191,7 @@ UINT32 go2000_state::screen_update_go2000(screen_device &screen, bitmap_ind16 &b { int tile = m_videoram[count]; int attr = m_videoram2[count]; - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, attr, 0, 0, x * 8, y * 8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, attr, 0, 0, x * 8, y * 8); count++; } } @@ -203,7 +203,7 @@ UINT32 go2000_state::screen_update_go2000(screen_device &screen, bitmap_ind16 &b { int tile = m_videoram[count]; int attr = m_videoram2[count]; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile, attr, 0, 0, x * 8, y * 8, 0xf); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile, attr, 0, 0, x * 8, y * 8, 0xf); count++; } } diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index 84b544da78c..f23c7c1a482 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -110,7 +110,7 @@ void gpworld_state::gpworld_draw_tiles(bitmap_rgb32 &bitmap,const rectangle &cli { int current_screen_character = (characterY*64) + characterX; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_tile_ram[current_screen_character], + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_tile_ram[current_screen_character], characterY, 0, 0, characterX*8, characterY*8, 0); } } diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index 9cb07311148..54cdfb75745 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -84,7 +84,7 @@ UINT32 istellar_state::screen_update_istellar(screen_device &screen, bitmap_rgb3 int tile = m_tile_ram[x+y*32]; int attr = m_tile_control_ram[x+y*32]; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,tile,attr & 0x0f,0, 0, x*8, y*8, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,tile,attr & 0x0f,0, 0, x*8, y*8, 0); } } diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c index cce75e48d2a..a5d783a32e4 100644 --- a/src/mame/drivers/jclub2.c +++ b/src/mame/drivers/jclub2.c @@ -220,7 +220,7 @@ void darkhors_state::draw_sprites_darkhors(bitmap_ind16 &bitmap, const rectangle sy = -sy; sy += 0xf8; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code/2, color, flipx, flipy, sx, sy, 0); } diff --git a/src/mame/drivers/lbeach.c b/src/mame/drivers/lbeach.c index 8abfef63ef2..7e1e0c353bf 100644 --- a/src/mame/drivers/lbeach.c +++ b/src/mame/drivers/lbeach.c @@ -148,7 +148,7 @@ UINT32 lbeach_state::screen_update_lbeach(screen_device &screen, bitmap_ind16 &b int sprite_y = 160; m_colmap_car.fill(0, cliprect); - m_gfxdecode->gfx(2)->transpen(m_colmap_car,cliprect, sprite_code, 0, 0, 0, sprite_x, sprite_y, 0); + m_gfxdecode->gfx(2)->transpen(m_colmap_car,cliprect, sprite_code, 0, 0, 0, sprite_x, sprite_y, 0); bitmap_ind16 &fg_bitmap = m_fg_tilemap->pixmap(); m_collision_bg_car = 0; @@ -167,7 +167,7 @@ UINT32 lbeach_state::screen_update_lbeach(screen_device &screen, bitmap_ind16 &b m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); // draw player car - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, sprite_code, 0, 0, 0, sprite_x, sprite_y, 0); + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, sprite_code, 0, 0, 0, sprite_x, sprite_y, 0); return 0; } diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c index 91c798e63bc..4986d261051 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -121,7 +121,7 @@ UINT32 lgp_state::screen_update_lgp(screen_device &screen, bitmap_rgb32 &bitmap, /* Somewhere there's a flag that offsets the tilemap by 0x100*x */ /* Palette is likely set somewhere as well (tile_control_ram?) */ - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_tile_ram[current_screen_character], 0, 0, 0, charx*8, chary*8, 0); diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index d83327bc348..d6967a0f7ee 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -529,14 +529,14 @@ UINT32 marinedt_state::screen_update_marinedt(screen_device &screen, bitmap_ind1 m_tx_tilemap->draw(screen, *m_tile, cliprect, 0, 0); m_obj1->fill(0); - m_gfxdecode->gfx(1)->transpen(*m_obj1,m_obj1->cliprect(), + m_gfxdecode->gfx(1)->transpen(*m_obj1,m_obj1->cliprect(), OBJ_CODE(m_obj1_a), OBJ_COLOR(m_obj1_a), OBJ_FLIPX(m_obj1_a), OBJ_FLIPY(m_obj1_a), 0, 0, 0); m_obj2->fill(0); - m_gfxdecode->gfx(2)->transpen(*m_obj2,m_obj2->cliprect(), + m_gfxdecode->gfx(2)->transpen(*m_obj2,m_obj2->cliprect(), OBJ_CODE(m_obj2_a), OBJ_COLOR(m_obj2_a), OBJ_FLIPX(m_obj2_a), OBJ_FLIPY(m_obj2_a), diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 3809fcf1f42..6885c9060d3 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -88,14 +88,14 @@ UINT32 mgolf_state::screen_update_mgolf(screen_device &screen, bitmap_ind16 &bit /* draw sprites */ for (i = 0; i < 2; i++) { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_video_ram[0x399 + 4 * i], i, 0, 0, m_video_ram[0x390 + 2 * i] - 7, m_video_ram[0x398 + 4 * i] - 16, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_video_ram[0x39b + 4 * i], i, 0, 0, diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 34bfd0b68d8..d94b8ddc244 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -182,7 +182,7 @@ void midas_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) UINT16 code = codes[y*2]; UINT16 attr = codes[y*2+1]; - m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, code, attr >> 8, attr & 1, attr & 2, diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index 283995b1b69..dc54d0047de 100644 --- a/src/mame/drivers/norautp.c +++ b/src/mame/drivers/norautp.c @@ -589,7 +589,7 @@ UINT32 norautp_state::screen_update_norautp(screen_device &screen, bitmap_ind16 int tile = m_np_vram[count] & 0x3f; int colour = (m_np_vram[count] & 0xc0) >> 6; - m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, tile, colour, 0, 0, (x * 32) + 8, y * 32); + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, tile, colour, 0, 0, (x * 32) + 8, y * 32); count+=2; } @@ -601,7 +601,7 @@ UINT32 norautp_state::screen_update_norautp(screen_device &screen, bitmap_ind16 int tile = m_np_vram[count] & 0x3f; int colour = (m_np_vram[count] & 0xc0) >> 6; - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, colour, 0, 0, x * 16, y * 32); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, colour, 0, 0, x * 16, y * 32); count++; } diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index 1b956fee089..f7abf79717d 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -148,7 +148,7 @@ UINT32 pzletime_state::screen_update_pzletime(screen_device &screen, bitmap_ind1 // is spriteram[offs + 0] & 0x200 flipy? it's always set - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, spr_offs, colour, 0, 1, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, spr_offs, colour, 0, 1, sx, sy, 0); } } diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index fcc4212bedb..a64f769f5df 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -347,7 +347,7 @@ UINT32 sbrkout_state::screen_update_sbrkout(screen_device &screen, bitmap_ind16 int sx = 31 * 8 - videoram[0x380 + 0x10 + ball * 2]; int sy = 30 * 8 - videoram[0x380 + 0x18 + ball * 2]; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, 0, 0, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, 0, 0, sx, sy, 0); } return 0; } diff --git a/src/mame/drivers/seabattl.c b/src/mame/drivers/seabattl.c index f994b45e10f..e1b86270fcb 100644 --- a/src/mame/drivers/seabattl.c +++ b/src/mame/drivers/seabattl.c @@ -156,7 +156,7 @@ UINT32 seabattl_state::screen_update_seabattl(screen_device &screen, bitmap_ind1 { for ( x = 0; x < 32; x++ ) { - m_gfxdecode->gfx(2)->opaque(bitmap,cliprect, (y & 0x0f) + (((x & 0x0f) + ((screen.frame_number() & 0xe0) >> 4)) << 4), 0, 0, 0, x*8, y*8 ); + m_gfxdecode->gfx(2)->opaque(bitmap,cliprect, (y & 0x0f) + (((x & 0x0f) + ((screen.frame_number() & 0xe0) >> 4)) << 4), 0, 0, 0, x*8, y*8 ); } } } @@ -180,7 +180,7 @@ UINT32 seabattl_state::screen_update_seabattl(screen_device &screen, bitmap_ind1 int x = ((offset & 0x0f) << 4) - ((m_objram[offset] & 0xf0) >> 4); int y = (offset & 0xf0); - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, 0, 0, 0, x, y, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, 0, 0, 0, x, y, 0); } } diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index cc86898d0ac..579c899e580 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -77,7 +77,7 @@ void segald_state::astron_draw_characters(bitmap_rgb32 &bitmap,const rectangle & for (characterY = 0; characterY < 32; characterY++) { int current_screen_character = (characterY*32) + characterX; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_fix_ram[current_screen_character], + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_fix_ram[current_screen_character], 1, 0, 0, characterX*8, characterY*8, 0); } } diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c index 3c5fe9185d7..812561f6ef7 100644 --- a/src/mame/drivers/sigmab98.c +++ b/src/mame/drivers/sigmab98.c @@ -300,7 +300,7 @@ void sigmab98_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { for (x = x0; x != x1; x += dx) { - m_gfxdecode->gfx(gfx)->zoom_transpen(bitmap,cliprect, + m_gfxdecode->gfx(gfx)->zoom_transpen(bitmap,cliprect, code++, color, flipx, flipy, (sx + x * dim) / 0x10000, (sy + y * dim) / 0x10000, diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 9b4144b7cd2..d1b56752dca 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -125,7 +125,7 @@ UINT32 supdrapo_state::screen_update_supdrapo(screen_device &screen, bitmap_ind1 /* Global Column Coloring, GUESS! */ color = m_col_line[(x*2) + 1] ? (m_col_line[(x*2) + 1] - 1) & 7 : 0; - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile,color, 0, 0, x*8, y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile,color, 0, 0, x*8, y*8); count++; } diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 8d7e444c6a4..59ace9a3d0e 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -123,7 +123,7 @@ void vroulet_state::video_start() UINT32 vroulet_state::screen_update_vroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, 0x320, 1, 0, 0, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, 0x320, 1, 0, 0, m_ball[1], m_ball[0] - 12, 0); return 0; } diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index 4c86effe40d..8645734b471 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -234,12 +234,12 @@ void _1943_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, if (priority) { if (color != 0x0a && color != 0x0b) - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flip_screen(), flip_screen(), sx, sy, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flip_screen(), flip_screen(), sx, sy, 0); } else { if (color == 0x0a || color == 0x0b) - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flip_screen(), flip_screen(), sx, sy, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flip_screen(), flip_screen(), sx, sy, 0); } } } diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index 5a6e659d06d..13dc2bea998 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -135,7 +135,7 @@ void aeroboto_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre y = 240 - y; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_spriteram[offs + 1], m_spriteram[offs + 2] & 0x07, flip_screen(), flip_screen(), diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index 3e4f470c713..9a5faa4fa09 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -473,7 +473,7 @@ void alpha68k_state::kyros_draw_sprites( bitmap_ind16 &bitmap, const rectangle & else jongbou_video_banking(&bank, data); - m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, tile, color, fx, fy, mx, my, 0); + m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, tile, color, fx, fy, mx, my, 0); } } //ZT @@ -532,7 +532,7 @@ void alpha68k_state::sstingry_draw_sprites( bitmap_ind16 &bitmap, const rectangl color = (data >> 7 & 0x18) | (data >> 13 & 7); tile = data & 0x3ff; bank = data >> 10 & 3; - m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, tile, color, fx, fy, mx, my, 0); + m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, tile, color, fx, fy, mx, my, 0); } //ZT if(m_flipscreen) diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index 00dd3d946b8..f2caf0cad3d 100644 --- a/src/mame/video/atarifb.c +++ b/src/mame/video/atarifb.c @@ -139,14 +139,14 @@ void atarifb_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec { shade = ((m_spriteram[obj * 2 + 1 + 0x20]) & 0x07); - m_gfxdecode->gfx(gfx + 1)->transpen(bitmap,bigfield_area, + m_gfxdecode->gfx(gfx + 1)->transpen(bitmap,bigfield_area, charcode, shade, flipx, flipy, sx, sy, 0); shade = ((m_spriteram[obj * 2 + 1 + 0x20]) & 0x08) >> 3; } - m_gfxdecode->gfx(gfx)->transpen(bitmap,bigfield_area, + m_gfxdecode->gfx(gfx)->transpen(bitmap,bigfield_area, charcode, shade, flipx, flipy, sx, sy, 0); @@ -158,7 +158,7 @@ void atarifb_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec if ((charcode == 0x11) && (sy == 0x07)) { sy = 0xf1; /* When multiplexed, it's 0x10...why? */ - m_gfxdecode->gfx(gfx)->transpen(bitmap,bigfield_area, + m_gfxdecode->gfx(gfx)->transpen(bitmap,bigfield_area, charcode, 0, flipx, flipy, sx, sy, 0); } diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c index 85dbf491976..4eee07dc4ec 100644 --- a/src/mame/video/bigevglf.c +++ b/src/mame/video/bigevglf.c @@ -74,7 +74,7 @@ void bigevglf_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre sx = m_spriteram2[i + 3]; sy = 200 - m_spriteram2[i]; for (j = 0; j < 16; j++) - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_spriteram1[(code << 4) + j] + ((m_spriteram1[0x400 + (code << 4) + j] & 0xf) << 8), m_spriteram2[i + 2] & 0xf, 0,0, diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index 9bef363223b..0ae24b05f57 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -229,20 +229,20 @@ UINT32 bking_state::screen_update_bking(screen_device &screen, bitmap_ind16 &bit m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); /* draw the balls */ - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, m_ball1_pic, m_palette_bank, 0, 0, m_xld1, m_yld1, 0); - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, m_ball2_pic, m_palette_bank, 0, 0, m_xld2, m_yld2, 0); /* draw the crow */ - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_crow_pic, m_palette_bank, m_crow_flip, m_crow_flip, @@ -269,7 +269,7 @@ void bking_state::screen_eof_bking(screen_device &screen, bool state) xld = m_xld1; yld = m_yld1; - m_gfxdecode->gfx(2)->opaque(m_colmap_ball,rect, m_ball1_pic, 0, 0, 0, 0, 0); + m_gfxdecode->gfx(2)->opaque(m_colmap_ball,rect, m_ball1_pic, 0, 0, 0, 0, 0); latch = 0x0c00; } @@ -278,7 +278,7 @@ void bking_state::screen_eof_bking(screen_device &screen, bool state) xld = m_xld2; yld = m_yld2; - m_gfxdecode->gfx(3)->opaque(m_colmap_ball,rect, m_ball2_pic, 0, 0, 0, 0, 0); + m_gfxdecode->gfx(3)->opaque(m_colmap_ball,rect, m_ball2_pic, 0, 0, 0, 0, 0); latch = 0x0400; } diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index 594f55b9eb6..532b84f2a44 100644 --- a/src/mame/video/blueprnt.c +++ b/src/mame/video/blueprnt.c @@ -145,7 +145,7 @@ void blueprnt_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } // sprites are slightly misplaced, regardless of the screen flip - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, 2 + sx, sy - 1, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, 2 + sx, sy - 1, 0); } } diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index 67ff289f02a..3b918d4d766 100644 --- a/src/mame/video/bsktball.c +++ b/src/mame/video/bsktball.c @@ -44,7 +44,7 @@ void bsktball_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipr pic = (pic & 0x3f); color = (color & 0x3f); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, pic, color, flipx, 0, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, pic, color, flipx, 0, sx, sy, 0); } } diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c index 206a468c411..4c17a0af09c 100644 --- a/src/mame/video/btime.c +++ b/src/mame/video/btime.c @@ -494,7 +494,7 @@ UINT32 btime_state::screen_update_bnj(screen_device &screen, bitmap_ind16 &bitma sy = 256 - sy; } - m_gfxdecode->gfx(2)->opaque(*m_background_bitmap,m_background_bitmap->cliprect(), + m_gfxdecode->gfx(2)->opaque(*m_background_bitmap,m_background_bitmap->cliprect(), (m_bnj_backgroundram[offs] >> 4) + ((offs & 0x80) >> 3) + 32, 0, flip_screen(), flip_screen(), @@ -540,7 +540,7 @@ UINT32 btime_state::screen_update_cookrace(screen_device &screen, bitmap_ind16 & sy = 33 - sy; } - m_gfxdecode->gfx(2)->opaque(bitmap,cliprect, + m_gfxdecode->gfx(2)->opaque(bitmap,cliprect, m_bnj_backgroundram[offs], 0, flip_screen(), flip_screen(), diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c index 649d71a3a69..c2cdaa837b7 100644 --- a/src/mame/video/buggychl.c +++ b/src/mame/video/buggychl.c @@ -105,7 +105,7 @@ void buggychl_state::draw_bg( bitmap_ind16 &bitmap, const rectangle &cliprect ) if (flip_screen_y()) sy = 31 - sy; - m_gfxdecode->gfx(0)->opaque(m_tmp_bitmap1,m_tmp_bitmap1.cliprect(), + m_gfxdecode->gfx(0)->opaque(m_tmp_bitmap1,m_tmp_bitmap1.cliprect(), code, 2, flip_screen_x(),flip_screen_y(), diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index fa4d9df2be7..6654b4cdeb6 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -145,7 +145,7 @@ UINT32 carjmbre_state::screen_update_carjmbre(screen_device &screen, bitmap_ind1 flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_spriteram[troffs + 1], m_spriteram[troffs + 2] & 0xf, flipx,flipy, diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c index f21a611b5c9..9f6fd4944e9 100644 --- a/src/mame/video/ccastles.c +++ b/src/mame/video/ccastles.c @@ -267,7 +267,7 @@ UINT32 ccastles_state::screen_update_ccastles(screen_device &screen, bitmap_ind1 int which = spriteaddr[offs]; int color = spriteaddr[offs + 2] >> 7; - m_gfxdecode->gfx(0)->transpen(m_spritebitmap,cliprect, which, color, flip, flip, x, y, 7); + m_gfxdecode->gfx(0)->transpen(m_spritebitmap,cliprect, which, color, flip, flip, x, y, 7); } /* draw the bitmap to the screen, looping over Y */ diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index e47def212e7..f522972f069 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -439,7 +439,7 @@ UINT32 centiped_state::screen_update_centiped(screen_device &screen, bitmap_ind1 int x = spriteram[offs + 0x20]; int y = 240 - spriteram[offs + 0x10]; - m_gfxdecode->gfx(1)->transmask(bitmap,spriteclip, code, color, flipx, flipy, x, y, m_penmask[color & 0x3f]); + m_gfxdecode->gfx(1)->transmask(bitmap,spriteclip, code, color, flipx, flipy, x, y, m_penmask[color & 0x3f]); } return 0; } @@ -484,7 +484,7 @@ UINT32 centiped_state::screen_update_warlords(screen_device &screen, bitmap_ind1 flipx = !flipx; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); } return 0; } @@ -515,7 +515,7 @@ UINT32 centiped_state::screen_update_bullsdrt(screen_device &screen, bitmap_ind1 int x = spriteram[offs + 0x20]; int y = 240 - spriteram[offs + 0x10]; - m_gfxdecode->gfx(1)->transpen(bitmap,spriteclip, code, color & 0x3f, 1, flipy, x, y, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,spriteclip, code, color & 0x3f, 1, flipy, x, y, 0); } return 0; } @@ -552,7 +552,7 @@ UINT32 centiped_state::screen_update_milliped(screen_device &screen, bitmap_ind1 flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(bitmap,spriteclip, code, color, flipx, flipy, x, y, m_penmask[color & 0x3f]); + m_gfxdecode->gfx(1)->transmask(bitmap,spriteclip, code, color, flipx, flipy, x, y, m_penmask[color & 0x3f]); } return 0; } diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index 79c253926c4..f39e0edb7ac 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -117,7 +117,7 @@ void citycon_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec flipx = !flipx; } - m_gfxdecode->gfx(m_spriteram[offs + 1] & 0x80 ? 2 : 1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(m_spriteram[offs + 1] & 0x80 ? 2 : 1)->transpen(bitmap,cliprect, m_spriteram[offs + 1] & 0x7f, m_spriteram[offs + 2] & 0x0f, flipx,flip_screen(), diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index 4c7f78840eb..f4b39b3b831 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -212,7 +212,7 @@ void cloak_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, sx, sy, 0); } } diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c index 4209d0c5153..58daec17e40 100644 --- a/src/mame/video/cloud9.c +++ b/src/mame/video/cloud9.c @@ -253,9 +253,9 @@ UINT32 cloud9_state::screen_update_cloud9(screen_device &screen, bitmap_ind16 &b int which = spriteaddr[offs + 0x20]; int color = 0; - m_gfxdecode->gfx(0)->transpen(m_spritebitmap,cliprect, which, color, xflip, yflip, x, y, 0); + m_gfxdecode->gfx(0)->transpen(m_spritebitmap,cliprect, which, color, xflip, yflip, x, y, 0); if (x >= 256 - 16) - m_gfxdecode->gfx(0)->transpen(m_spritebitmap,cliprect, which, color, xflip, yflip, x - 256, y, 0); + m_gfxdecode->gfx(0)->transpen(m_spritebitmap,cliprect, which, color, xflip, yflip, x - 256, y, 0); } /* draw the bitmap to the screen, looping over Y */ diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index ef774fa11d6..cbca0a598e8 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -113,7 +113,7 @@ void commando_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } if (bank < 3) - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 15); + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 15); } } diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c index 4607030a884..1f1b6796a54 100644 --- a/src/mame/video/cvs.c +++ b/src/mame/video/cvs.c @@ -154,7 +154,7 @@ UINT32 cvs_state::screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap, int gfxnum = (code < ram_based_char_start_indices[m_character_banking_mode]) ? 0 : 1; - m_gfxdecode->gfx(gfxnum)->opaque(m_background_bitmap,m_background_bitmap.cliprect(), + m_gfxdecode->gfx(gfxnum)->opaque(m_background_bitmap,m_background_bitmap.cliprect(), code, color, 0, 0, x, y); @@ -170,7 +170,7 @@ UINT32 cvs_state::screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap, collision_color = 0x102; } - m_gfxdecode->gfx(gfxnum)->opaque(m_collision_background,m_collision_background.cliprect(), + m_gfxdecode->gfx(gfxnum)->opaque(m_collision_background,m_collision_background.cliprect(), code, collision_color, 0, 0, x, y); diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index 52b98b2448e..dec4420abaa 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -248,10 +248,10 @@ void decocass_state::draw_object(bitmap_ind16 &bitmap, const rectangle &cliprect else sx = 91 - (m_part_h_shift & 0x7f); - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, 0, color, 0, 0, sx + 64, sy, 0); - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, 1, color, 0, 0, sx, sy, 0); - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, 0, color, 0, 1, sx + 64, sy - 64, 0); - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, 1, color, 0, 1, sx, sy - 64, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, 0, color, 0, 0, sx + 64, sy, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, 1, color, 0, 0, sx, sy, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, 0, color, 0, 1, sx + 64, sy - 64, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, 1, color, 0, 1, sx, sy - 64, 0); } void decocass_state::draw_center(bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -515,7 +515,7 @@ void decocass_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec sy -= sprite_y_adjust; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite_ram[offs + interleave], color, flipx,flipy, @@ -524,7 +524,7 @@ void decocass_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec sy += (flip_screen() ? -256 : 256); // Wrap around - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite_ram[offs + interleave], color, flipx,flipy, diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index 4a562838fa2..35b4f7ff517 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -632,11 +632,11 @@ void dkong_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, } y = scanline - ((y + add_y + 1 + scanline_vfc) & 0x0F); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); // wraparound - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, m_flip ? x + 256 : x - 256, y, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y - 256, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, m_flip ? x + 256 : x - 256, y, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y - 256, 0); num_sprt++; } diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c index 9648afa3bc2..bda0ac8f208 100644 --- a/src/mame/video/equites.c +++ b/src/mame/video/equites.c @@ -275,7 +275,7 @@ void equites_state::equites_draw_sprites_block( bitmap_ind16 &bitmap, const rect // sprites are 16x14 centered in a 16x16 square, so skip the first line sy += 1; - m_gfxdecode->gfx(2)->transmask(bitmap,cliprect, + m_gfxdecode->gfx(2)->transmask(bitmap,cliprect, tile, color, fx, fy, diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c index 21dec79b2a4..845f53efc78 100644 --- a/src/mame/video/exerion.c +++ b/src/mame/video/exerion.c @@ -406,7 +406,7 @@ UINT32 exerion_state::screen_update_exerion(screen_device &screen, bitmap_ind16 int y = m_cocktail_flip ? (31*8 - 8*sy) : 8*sy; offs = sx + sy * 64; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_videoram[offs] + 256 * m_char_bank, ((m_videoram[offs] & 0xf0) >> 4) + m_char_palette * 16, m_cocktail_flip, m_cocktail_flip, x, y, 0); diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c index 966dd994931..7410bed6842 100644 --- a/src/mame/video/exidy.c +++ b/src/mame/video/exidy.c @@ -216,7 +216,7 @@ void exidy_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) int sx = 236 - *m_sprite2_xpos - 4; int sy = 244 - *m_sprite2_ypos - 4; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, ((*m_spriteno >> 4) & 0x0f) + 32 + 16 * sprite_set_2, 1, 0, 0, sx, sy, 0); @@ -230,7 +230,7 @@ void exidy_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) if (sy < 0) sy = 0; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, (*m_spriteno & 0x0f) + 16 * sprite_set_1, 0, 0, 0, sx, sy, 0); } @@ -295,7 +295,7 @@ void exidy_state::check_collision() { org_1_x = 236 - *m_sprite1_xpos - 4; org_1_y = 244 - *m_sprite1_ypos - 4; - m_gfxdecode->gfx(0)->transpen(m_motion_object_1_vid,clip, + m_gfxdecode->gfx(0)->transpen(m_motion_object_1_vid,clip, (*m_spriteno & 0x0f) + 16 * sprite_set_1, 0, 0, 0, 0, 0, 0); } @@ -304,7 +304,7 @@ void exidy_state::check_collision() m_motion_object_2_vid.fill(0xff, clip); org_2_x = 236 - *m_sprite2_xpos - 4; org_2_y = 244 - *m_sprite2_ypos - 4; - m_gfxdecode->gfx(0)->transpen(m_motion_object_2_vid,clip, + m_gfxdecode->gfx(0)->transpen(m_motion_object_2_vid,clip, ((*m_spriteno >> 4) & 0x0f) + 32 + 16 * sprite_set_2, 0, 0, 0, 0, 0, 0); @@ -314,7 +314,7 @@ void exidy_state::check_collision() { sx = org_2_x - org_1_x; sy = org_2_y - org_1_y; - m_gfxdecode->gfx(0)->transpen(m_motion_object_2_clip,clip, + m_gfxdecode->gfx(0)->transpen(m_motion_object_2_clip,clip, ((*m_spriteno >> 4) & 0x0f) + 32 + 16 * sprite_set_2, 0, 0, 0, sx, sy, 0); } diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index 4ff23a973dc..1fc8fa88f5a 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -109,7 +109,7 @@ void exprraid_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); @@ -118,7 +118,7 @@ void exprraid_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre if (attr & 0x10) { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, flipx, flipy, sx, sy + (flip_screen() ? -16 : 16), 0); diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c index 5b26113b7a6..6fef273743d 100644 --- a/src/mame/video/exzisus.c +++ b/src/mame/video/exzisus.c @@ -136,7 +136,7 @@ UINT32 exzisus_state::screen_update_exzisus(screen_device &screen, bitmap_ind16 y = 248 - y; } - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code & 0x3fff, color, flip_screen(), flip_screen(), @@ -205,7 +205,7 @@ UINT32 exzisus_state::screen_update_exzisus(screen_device &screen, bitmap_ind16 y = 248 - y; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code & 0x3fff, color, flip_screen(), flip_screen(), diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index edac891e4ae..97c5e164bd6 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -201,7 +201,7 @@ UINT32 fcombat_state::screen_update_fcombat(screen_device &screen, bitmap_ind16 int y = m_cocktail_flip ? (31 * 8 - 8 * sy) : 8 * sy; offs = sx + sy * 64; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_videoram[offs] + 256 * m_char_bank, ((m_videoram[offs] & 0xf0) >> 4) + m_char_palette * 16, m_cocktail_flip, m_cocktail_flip, x, y, 0); diff --git a/src/mame/video/fgoal.c b/src/mame/video/fgoal.c index 049a715b152..b6e17fd56d3 100644 --- a/src/mame/video/fgoal.c +++ b/src/mame/video/fgoal.c @@ -48,14 +48,14 @@ UINT32 fgoal_state::screen_update_fgoal(screen_device &screen, bitmap_ind16 &bit if (m_fgoal_player == 1 && (ioport("IN1")->read() & 0x40)) { - m_gfxdecode->gfx(0)->zoom_opaque(m_fgbitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_opaque(m_fgbitmap,cliprect, 0, (m_fgoal_player << 2) | m_current_color, 1, 1, 0, 16, 0x40000, 0x40000); - m_gfxdecode->gfx(1)->zoom_opaque(m_bgbitmap,cliprect, + m_gfxdecode->gfx(1)->zoom_opaque(m_bgbitmap,cliprect, 0, 0, 1, 1, 0, 16, @@ -64,14 +64,14 @@ UINT32 fgoal_state::screen_update_fgoal(screen_device &screen, bitmap_ind16 &bit } else { - m_gfxdecode->gfx(0)->zoom_opaque(m_fgbitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_opaque(m_fgbitmap,cliprect, 0, (m_fgoal_player << 2) | m_current_color, 0, 0, 0, 0, 0x40000, 0x40000); - m_gfxdecode->gfx(1)->zoom_opaque(m_bgbitmap,cliprect, + m_gfxdecode->gfx(1)->zoom_opaque(m_bgbitmap,cliprect, 0, 0, 0, 0, 0, 0, diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c index 92e1bfa3c07..36a85d9a3a2 100644 --- a/src/mame/video/funkybee.c +++ b/src/mame/video/funkybee.c @@ -111,7 +111,7 @@ void funkybee_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipx = !flipx; } - m_gfxdecode->gfx(2 + m_gfx_bank)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2 + m_gfx_bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c index 18308d4775c..744e0ccb669 100644 --- a/src/mame/video/funybubl.c +++ b/src/mame/video/funybubl.c @@ -65,7 +65,7 @@ void funybubl_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre // bits 0x40 and 0x10 not used?... - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tile, 0, 0, 0, xpos, ypos, 255); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tile, 0, 0, 0, xpos, ypos, 255); source -= 0x20; } } @@ -86,7 +86,7 @@ UINT32 funybubl_state::screen_update_funybubl(screen_device &screen, bitmap_ind1 int data; data = m_banked_vram[offs] | (m_banked_vram[offs + 1] << 8); - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, data & 0x7fff, (data & 0x8000) ? 2 : 1, 0, 0, x*8, y*8, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, data & 0x7fff, (data & 0x8000) ? 2 : 1, 0, 0, x*8, y*8, 0); offs += 2; } } diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c index 51a2c14f54b..b42566f48df 100644 --- a/src/mame/video/galaxold.c +++ b/src/mame/video/galaxold.c @@ -1700,7 +1700,7 @@ void galaxold_state::draw_sprites(bitmap_ind16 &bitmap, UINT8 *spriteram, size_t if (offs < 3*4) sy++; - m_gfxdecode->gfx(1)->transpen(bitmap,m_flipscreen_x ? spritevisibleareaflipx : spritevisiblearea, + m_gfxdecode->gfx(1)->transpen(bitmap,m_flipscreen_x ? spritevisibleareaflipx : spritevisiblearea, code,color, flipx,flipy, sx,sy,0); diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index dcaed14e408..558f7cd8bc0 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -155,7 +155,7 @@ void gberet_state::gberet_draw_sprites( bitmap_ind16 &bitmap, const rectangle &c flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, colortable_get_transpen_mask(machine().colortable, m_gfxdecode->gfx(1), color, 0)); } } @@ -207,7 +207,7 @@ void gberet_state::gberetb_draw_sprites( bitmap_ind16 &bitmap, const rectangle & flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, colortable_get_transpen_mask(machine().colortable, m_gfxdecode->gfx(1), color, 0)); } } diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index 69ffd301ff0..685701aee25 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -162,7 +162,7 @@ void gunsmoke_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); } } diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c index dc76248893e..9c1dd77ac11 100644 --- a/src/mame/video/himesiki.c +++ b/src/mame/video/himesiki.c @@ -78,7 +78,7 @@ void himesiki_state::himesiki_draw_sprites( bitmap_ind16 &bitmap, const rectangl y -= 0x100; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, col, fx, fy, x, y, 15); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, col, fx, fy, x, y, 15); } for (offs = 0; offs < 0x100; offs += 4) @@ -107,7 +107,7 @@ void himesiki_state::himesiki_draw_sprites( bitmap_ind16 &bitmap, const rectangl if (y > 0xf0) y -= 0x100; - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, col, f, f, x, y, 15); + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, col, f, f, x, y, 15); } } diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index 03fb4302e35..367bedacb49 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -122,14 +122,14 @@ void homerun_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec int flipx = (spriteram[offs + 2] & 0x40) >> 6; int flipy = (spriteram[offs + 2] & 0x80) >> 7; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, sx,sy,0); // wraparound - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c index d0472fff4e3..e737de33b4c 100644 --- a/src/mame/video/ikki.c +++ b/src/mame/video/ikki.c @@ -91,7 +91,7 @@ void ikki_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) if (y > 240) y = y - 256; - m_gfxdecode->gfx(1)->transmask(m_sprite_bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(m_sprite_bitmap,cliprect, code, color, m_flipscreen,m_flipscreen, x,y, diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c index 9387e29fdc5..8b5494324c8 100644 --- a/src/mame/video/jailbrek.c +++ b/src/mame/video/jailbrek.c @@ -85,7 +85,7 @@ void jailbrek_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, colortable_get_transpen_mask(machine().colortable, m_gfxdecode->gfx(1), color, 0)); } diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index 2f9ef4140df..c7f97884f1b 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -99,10 +99,10 @@ void karnov_state::draw_background( bitmap_ind16 &bitmap, const rectangle &clipr color = tile >> 12; tile = tile & 0x7ff; if (m_flipscreen) - m_gfxdecode->gfx(1)->opaque(*m_bitmap_f,m_bitmap_f->cliprect(),tile, + m_gfxdecode->gfx(1)->opaque(*m_bitmap_f,m_bitmap_f->cliprect(),tile, color, fx, fy, 496-16*mx,496-16*my); else - m_gfxdecode->gfx(1)->opaque(*m_bitmap_f,m_bitmap_f->cliprect(),tile, + m_gfxdecode->gfx(1)->opaque(*m_bitmap_f,m_bitmap_f->cliprect(),tile, color, fx, fy, 16*mx,16*my); } diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c index ec8e57ec7c0..818a9cf1ab1 100644 --- a/src/mame/video/kchamp.c +++ b/src/mame/video/kchamp.c @@ -89,7 +89,7 @@ void kchamp_state::kchamp_draw_sprites( bitmap_ind16 &bitmap, const rectangle &c flipy = !flipy; } - m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); } } @@ -117,7 +117,7 @@ void kchamp_state::kchampvs_draw_sprites( bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); } } diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index 6753e926a35..99dc86773ba 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -232,7 +232,7 @@ void kingofb_state::kingofb_draw_sprites(bitmap_ind16 &bitmap, const rectangle & flipy = !flipy; } - m_gfxdecode->gfx(2 + bank)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2 + bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); @@ -289,7 +289,7 @@ void kingofb_state::ringking_draw_sprites( bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - m_gfxdecode->gfx(2 + bank)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2 + bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index 17ab31564c0..18a9fb4fc33 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -301,7 +301,7 @@ void lasso_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, code = source[1] & 0x3f; color = source[2] & 0x0f; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code | ((UINT16)m_gfxbank << 6), color, flipx, flipy, diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c index cea01501c0d..a875ef12ff1 100644 --- a/src/mame/video/lordgun.c +++ b/src/mame/video/lordgun.c @@ -273,7 +273,7 @@ void lordgun_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect { for (x = x0; x != x1; x += dx) { - m_gfxdecode->gfx(4)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(4)->transpen(bitmap,cliprect, code, color + pri * 0x800/0x40, flipx, flipy, sx + x * 0x10, sy + y * 0x10, diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index 78c91d64795..7e23a3a4557 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -410,7 +410,7 @@ UINT32 m52_state::screen_update_m52(screen_device &screen, bitmap_ind16 &bitmap, clip = cliprect; #endif - m_gfxdecode->gfx(1)->transmask(bitmap,clip, + m_gfxdecode->gfx(1)->transmask(bitmap,clip, code, color, flipx, flipy, sx, sy, colortable_get_transpen_mask(machine().colortable, m_gfxdecode->gfx(1), color, 512 + 32)); } diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c index 9952eb07c6d..979f366c46e 100644 --- a/src/mame/video/m57.c +++ b/src/mame/video/m57.c @@ -241,7 +241,7 @@ void m57_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) flipy = !flipy; } - m_gfxdecode->gfx(1 + bank)->transmask(bitmap,cliprect, + m_gfxdecode->gfx(1 + bank)->transmask(bitmap,cliprect, tile_number, color, flipx, flipy, diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index da2b55a6369..099ad867fa6 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -148,8 +148,8 @@ VIDEO_START_MEMBER(madalien_state,madalien) m_gfxdecode->gfx(0)->set_source(m_charram); - m_gfxdecode->gfx(2)->opaque(*m_headlight_bitmap,m_headlight_bitmap->cliprect(), 0, 0, 0, 0, 0x00, 0x00); - m_gfxdecode->gfx(2)->opaque(*m_headlight_bitmap,m_headlight_bitmap->cliprect(), 0, 0, 0, 1, 0x00, 0x40); + m_gfxdecode->gfx(2)->opaque(*m_headlight_bitmap,m_headlight_bitmap->cliprect(), 0, 0, 0, 0, 0x00, 0x00); + m_gfxdecode->gfx(2)->opaque(*m_headlight_bitmap,m_headlight_bitmap->cliprect(), 0, 0, 0, 1, 0x00, 0x40); } diff --git a/src/mame/video/magmax.c b/src/mame/video/magmax.c index 0e83750d0a2..c8b5a206714 100644 --- a/src/mame/video/magmax.c +++ b/src/mame/video/magmax.c @@ -200,7 +200,7 @@ UINT32 magmax_state::screen_update_magmax(screen_device &screen, bitmap_ind16 &b if (code & 0x80) /* sprite bankswitch */ code += (*m_vreg & 0x30) * 0x8; - m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, @@ -230,7 +230,7 @@ UINT32 magmax_state::screen_update_magmax(screen_device &screen, bitmap_ind16 &b sy = 31 - sy; } - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, 0, m_flipscreen, m_flipscreen, diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c index 87f1ecbf63f..0fdfa78f0ac 100644 --- a/src/mame/video/malzak.c +++ b/src/mame/video/malzak.c @@ -38,7 +38,7 @@ UINT32 malzak_state::screen_update_malzak(screen_device &screen, bitmap_rgb32 &b if (sx < -15*2) sx += 256*2; - m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, m_playfield_code[x * 16 + y], 2, 0, 0, sx, sy, 0x20000, 0x20000, 0); + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, m_playfield_code[x * 16 + y], 2, 0, 0, sx, sy, 0x20000, 0x20000, 0); } /* update the S2636 chips */ diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c index 6f3dbef5c3b..c34cc71b5f3 100644 --- a/src/mame/video/matmania.c +++ b/src/mame/video/matmania.c @@ -137,7 +137,7 @@ UINT32 matmania_state::screen_update_matmania(screen_device &screen, bitmap_ind1 int sx = 15 - offs / 32; int sy = offs % 32; - m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap,m_tmpbitmap->cliprect(), + m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap,m_tmpbitmap->cliprect(), m_videoram[offs] + ((m_colorram[offs] & 0x08) << 5), (m_colorram[offs] & 0x30) >> 4, 0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */ @@ -150,7 +150,7 @@ UINT32 matmania_state::screen_update_matmania(screen_device &screen, bitmap_ind1 int sx = 15 - offs / 32; int sy = offs % 32; - m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap2,m_tmpbitmap2->cliprect(), + m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap2,m_tmpbitmap2->cliprect(), m_videoram3[offs] + ((m_colorram3[offs] & 0x08) << 5), (m_colorram3[offs] & 0x30) >> 4, 0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */ @@ -172,7 +172,7 @@ UINT32 matmania_state::screen_update_matmania(screen_device &screen, bitmap_ind1 { if (spriteram[offs] & 0x01) { - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, spriteram[offs + 1] + ((spriteram[offs] & 0xf0) << 4), (spriteram[offs] & 0x08) >> 3, spriteram[offs] & 0x04, spriteram[offs] & 0x02, @@ -208,7 +208,7 @@ UINT32 matmania_state::screen_update_maniach(screen_device &screen, bitmap_ind16 int sx = 15 - offs / 32; int sy = offs % 32; - m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap,m_tmpbitmap->cliprect(), + m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap,m_tmpbitmap->cliprect(), m_videoram[offs] + ((m_colorram[offs] & 0x03) << 8), (m_colorram[offs] & 0x30) >> 4, 0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */ @@ -221,7 +221,7 @@ UINT32 matmania_state::screen_update_maniach(screen_device &screen, bitmap_ind16 int sx = 15 - offs / 32; int sy = offs % 32; - m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap2,m_tmpbitmap2->cliprect(), + m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap2,m_tmpbitmap2->cliprect(), m_videoram3[offs] + ((m_colorram3[offs] & 0x03) << 8), (m_colorram3[offs] & 0x30) >> 4, 0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */ diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c index 9c4b6221258..52c92b7fc17 100644 --- a/src/mame/video/meadows.c +++ b/src/mame/video/meadows.c @@ -88,7 +88,7 @@ void meadows_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip) int bank = i; /* that fixes it for now :-/ */ int flip = spriteram[i+8] >> 5; /* bit #5 flip vertical flag */ - m_gfxdecode->gfx(bank + 1)->transpen(bitmap,clip, code, 0, flip, 0, x, y, 0); + m_gfxdecode->gfx(bank + 1)->transpen(bitmap,clip, code, 0, flip, 0, x, y, 0); } } diff --git a/src/mame/video/megazone.c b/src/mame/video/megazone.c index 07cc50dfbf6..f8f2cfe7aaf 100644 --- a/src/mame/video/megazone.c +++ b/src/mame/video/megazone.c @@ -133,7 +133,7 @@ UINT32 megazone_state::screen_update_megazone(screen_device &screen, bitmap_ind1 flipy = !flipy; } - m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap,m_tmpbitmap->cliprect(), + m_gfxdecode->gfx(1)->opaque(*m_tmpbitmap,m_tmpbitmap->cliprect(), ((int)m_videoram[offs]) + ((m_colorram[offs] & (1 << 7) ? 256 : 0) ), (m_colorram[offs] & 0x0f) + 0x10, flipx,flipy, @@ -213,7 +213,7 @@ UINT32 megazone_state::screen_update_megazone(screen_device &screen, bitmap_ind1 - m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, ((int)m_videoram2[offs]) + ((m_colorram2[offs] & (1 << 7) ? 256 : 0) ), (m_colorram2[offs] & 0x0f) + 0x10, flipx,flipy, diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index eab073b3a80..71b7ea06f55 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -310,7 +310,7 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state) m_bg_tilemap->draw(screen, m_helper, rect, 0, 0); - m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); m_coll_bit2 |= collision_check(rect); @@ -321,7 +321,7 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state) m_fg_tilemap->draw(screen, m_helper, rect, 0, 0); - m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); m_coll_bit1 |= collision_check(rect); @@ -359,10 +359,10 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state) sy2 = 240 - sy2; } - m_gfxdecode->gfx(1)->transpen(m_helper,rect, code2, 0, flipx2, flipy2, sx2, sy2, 0); + m_gfxdecode->gfx(1)->transpen(m_helper,rect, code2, 0, flipx2, flipy2, sx2, sy2, 0); } - m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); m_coll_bit0 |= collision_check(rect); } @@ -440,10 +440,10 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state) sy2 = 240 - sy2; } - m_gfxdecode->gfx(1)->transpen(m_helper,rect, code2, 0, flipx2, flipy2, sx2, sy2, 0); + m_gfxdecode->gfx(1)->transpen(m_helper,rect, code2, 0, flipx2, flipy2, sx2, sy2, 0); } - m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); m_coll_bit3 |= collision_check(rect); } @@ -521,10 +521,10 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state) sy2 = 240 - sy2; } - m_gfxdecode->gfx(1)->transpen(m_helper,rect, code2, 0, flipx2, flipy2, sx2, sy2, 0); + m_gfxdecode->gfx(1)->transpen(m_helper,rect, code2, 0, flipx2, flipy2, sx2, sy2, 0); } - m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(m_helper2,rect, code, 0, flipx, flipy, sx, sy, 0); m_coll_bit6 |= collision_check(rect); } diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 5e5f824c4a5..53442614444 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -242,7 +242,7 @@ void mrdo_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ) { if (spriteram[offs + 1] != 0) { - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, spriteram[offs], spriteram[offs + 2] & 0x0f, spriteram[offs + 2] & 0x10, spriteram[offs + 2] & 0x20, spriteram[offs + 3], 256 - spriteram[offs + 1], 0); diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index 784a3643b88..653edf08a33 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -133,7 +133,7 @@ void mrjong_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprt, color, flipx, flipy, diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index e827c46b0d1..608f3b77c70 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -173,7 +173,7 @@ void nycaptor_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipx = BIT(m_spriteram[offs + 1], 6); flipy = BIT(m_spriteram[offs + 1], 7); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, pal, flipx,flipy, @@ -182,7 +182,7 @@ void nycaptor_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre if (m_spriteram[offs + 3] > 240) { sx = (m_spriteram[offs + 3] - 256); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, pal, flipx,flipy, diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index fa6bb6b644d..69426a27715 100644 --- a/src/mame/video/orbit.c +++ b/src/mame/video/orbit.c @@ -69,7 +69,7 @@ void orbit_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect hpos <<= 1; vpos <<= 1; - m_gfxdecode->gfx(layout)->zoom_transpen(bitmap,cliprect, code, 0, flip_x, flip_y, + m_gfxdecode->gfx(layout)->zoom_transpen(bitmap,cliprect, code, 0, flip_x, flip_y, hpos, vpos, zoom_x, zoom_y, 0); } } diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c index 8fa4e6f61cf..d2d5f26bcd8 100644 --- a/src/mame/video/pktgaldx.c +++ b/src/mame/video/pktgaldx.c @@ -43,7 +43,7 @@ UINT32 pktgaldx_state::screen_update_pktgaldb(screen_device &screen, bitmap_ind1 y &= 0x1ff; y -= 8; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tileno ^ 0x1000, colour, 0, 0, x, y, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tileno ^ 0x1000, colour, 0, 0, x, y, 0); } for (offset = 0x1600/2; offset < 0x2000 / 2; offset += 8) @@ -57,7 +57,7 @@ UINT32 pktgaldx_state::screen_update_pktgaldb(screen_device &screen, bitmap_ind1 y &= 0x1ff; y -= 8; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tileno ^ 0x4000, colour, 0, 0, x, y, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tileno ^ 0x4000, colour, 0, 0, x, y, 0); } for (offset = 0x2000/2; offset < 0x4000 / 2; offset += 8) @@ -71,7 +71,7 @@ UINT32 pktgaldx_state::screen_update_pktgaldb(screen_device &screen, bitmap_ind1 y &= 0x1ff; y -= 8; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tileno ^ 0x3000, colour, 0, 0, x, y, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tileno ^ 0x3000, colour, 0, 0, x, y, 0); } return 0; diff --git a/src/mame/video/polyplay.c b/src/mame/video/polyplay.c index e19beb76bad..c9677910f14 100644 --- a/src/mame/video/polyplay.c +++ b/src/mame/video/polyplay.c @@ -57,7 +57,7 @@ UINT32 polyplay_state::screen_update_polyplay(screen_device &screen, bitmap_ind1 int sy = offs >> 6 << 3; UINT8 code = videoram[offs]; - m_gfxdecode->gfx((code >> 7) & 0x01)->opaque(bitmap,cliprect, + m_gfxdecode->gfx((code >> 7) & 0x01)->opaque(bitmap,cliprect, code, 0, 0, 0, sx, sy); } diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c index 54f11c6a44b..4689c07d7ff 100644 --- a/src/mame/video/poolshrk.c +++ b/src/mame/video/poolshrk.c @@ -40,7 +40,7 @@ UINT32 poolshrk_state::screen_update_poolshrk(screen_device &screen, bitmap_ind1 int hpos = m_hpos_ram[i]; int vpos = m_vpos_ram[i]; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, i, (i == 0) ? 0 : 1, 0, 0, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, i, (i == 0) ? 0 : 1, 0, 0, 248 - hpos, vpos - 15, 0); } diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index e1aa09634b6..4b2381b2066 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -213,7 +213,7 @@ void popper_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_spriteram[offs + 1], (m_spriteram[offs + 2] & 0x0f), flipx,flipy, diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index 2601590dfa2..97008477724 100644 --- a/src/mame/video/prehisle.c +++ b/src/mame/video/prehisle.c @@ -147,7 +147,7 @@ void prehisle_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if ((foreground && priority) || (!foreground && !priority)) { - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 15); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 15); } } } diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c index 56aa3dcce79..67f231ff152 100644 --- a/src/mame/video/renegade.c +++ b/src/mame/video/renegade.c @@ -103,7 +103,7 @@ void renegade_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if (attributes & 0x80) /* big sprite */ { sprite_number &= ~1; - m_gfxdecode->gfx(sprite_bank)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(sprite_bank)->transpen(bitmap,cliprect, sprite_number + 1, color, xflip, flip_screen(), @@ -113,7 +113,7 @@ void renegade_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { sy += (flip_screen() ? -16 : 16); } - m_gfxdecode->gfx(sprite_bank)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(sprite_bank)->transpen(bitmap,cliprect, sprite_number, color, xflip, flip_screen(), diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c index 142e7de7bd3..14040c01020 100644 --- a/src/mame/video/rocnrope.c +++ b/src/mame/video/rocnrope.c @@ -129,7 +129,7 @@ void rocnrope_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { int color = spriteram_2[offs] & 0x0f; - m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, spriteram[offs + 1], color, spriteram_2[offs] & 0x40,~spriteram_2[offs] & 0x80, diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c index c70c3046d40..40735dd025e 100644 --- a/src/mame/video/rpunch.c +++ b/src/mame/video/rpunch.c @@ -218,7 +218,7 @@ void rpunch_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, if (x >= BITMAP_WIDTH) x -= 512; if (y >= BITMAP_HEIGHT) y -= 512; - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color + (m_sprite_palette / 16), xflip, yflip, x, y, 15); } } diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c index 730ddb92422..b27913c7920 100644 --- a/src/mame/video/runaway.c +++ b/src/mame/video/runaway.c @@ -101,13 +101,13 @@ UINT32 runaway_state::screen_update_runaway(screen_device &screen, bitmap_ind16 code |= (m_sprite_ram[i + 0x30] << 2) & 0x1c0; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, x, 240 - y, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, @@ -135,13 +135,13 @@ UINT32 runaway_state::screen_update_qwak(screen_device &screen, bitmap_ind16 &bi code |= (m_sprite_ram[i + 0x30] << 2) & 0x1c0; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, x, 240 - y, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c index ab8ba2f3432..77b5170c640 100644 --- a/src/mame/video/sauro.c +++ b/src/mame/video/sauro.c @@ -128,7 +128,7 @@ void sauro_state::sauro_draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip sy = 240 - sy; } - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c index 31228c926e4..0ec1477d6be 100644 --- a/src/mame/video/scotrsht.c +++ b/src/mame/video/scotrsht.c @@ -114,7 +114,7 @@ void scotrsht_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, colortable_get_transpen_mask(machine().colortable, m_gfxdecode->gfx(1), color, m_palette_bank * 16)); } diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index 4546d1523bd..3e5ffc4a123 100644 --- a/src/mame/video/segag80r.c +++ b/src/mame/video/segag80r.c @@ -644,7 +644,7 @@ void segag80r_state::draw_videoram(bitmap_ind16 &bitmap, const rectangle &clipre UINT8 tile = videoram[offs]; /* draw the tile */ - m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, tile, tile >> 4, m_video_flip, m_video_flip, x*8, y*8, transparent_pens[tile >> 4]); + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, tile, tile >> 4, m_video_flip, m_video_flip, x*8, y*8, transparent_pens[tile >> 4]); } } } diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index 3ee04b836e1..7e8212be0f6 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -164,25 +164,25 @@ void sf_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ) t = c2; c2 = c4; c4 = t; } - m_gfxdecode->gfx(2)->transpen(bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c1), color, flipx,flipy, sx,sy, 15); - m_gfxdecode->gfx(2)->transpen(bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c2), color, flipx,flipy, sx+16,sy, 15); - m_gfxdecode->gfx(2)->transpen(bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c3), color, flipx,flipy, sx,sy+16, 15); - m_gfxdecode->gfx(2)->transpen(bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c4), color, @@ -199,7 +199,7 @@ void sf_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ) flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c), color, diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c index eebb1d78019..9824c586c48 100644 --- a/src/mame/video/skyraid.c +++ b/src/mame/video/skyraid.c @@ -28,7 +28,7 @@ void skyraid_state::draw_text(bitmap_ind16 &bitmap, const rectangle &cliprect) y = 136 + 16 * (i ^ 1); for (x = 0; x < bitmap.width(); x += 16) - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, *p++, 0, 0, 0, x, y, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, *p++, 0, 0, 0, x, y, 0); } } @@ -77,7 +77,7 @@ void skyraid_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect vert -= 31; if (flag & 1) - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code ^ 15, code >> 3, 0, 0, horz / 2, vert, 2); } @@ -99,7 +99,7 @@ void skyraid_state::draw_missiles(bitmap_ind16 &bitmap, const rectangle &cliprec vert -= 15; horz -= 31; - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code ^ 15, 0, 0, 0, horz / 2, vert, 0); } diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index 80ac5d16d45..d33641c2199 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -246,7 +246,7 @@ void snk68_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, fy = !fy; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tile, color, fx, fy, diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index 726577e4782..7698705ea3c 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -164,8 +164,8 @@ void sonson_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect sx, sy, 0); /* wrap-around */ - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx - 256, sy, 0); - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy - 256, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx - 256, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy - 256, 0); } } diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c index 29c6db2453e..794c53d41a3 100644 --- a/src/mame/video/sprint2.c +++ b/src/mame/video/sprint2.c @@ -125,7 +125,7 @@ UINT32 sprint2_state::screen_update_sprint2(screen_device &screen, bitmap_ind16 for (i = 0; i < 4; i++) { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, get_sprite_code(video_ram, i), i, 0, 0, @@ -169,7 +169,7 @@ void sprint2_state::screen_eof_sprint2(screen_device &screen, bool state) m_bg_tilemap->draw(screen, m_helper, rect, 0, 0); - m_gfxdecode->gfx(1)->transpen(m_helper,rect, + m_gfxdecode->gfx(1)->transpen(m_helper,rect, get_sprite_code(video_ram, i), 0, 0, 0, @@ -183,7 +183,7 @@ void sprint2_state::screen_eof_sprint2(screen_device &screen, bool state) for (j = 0; j < 4; j++) if (j != i) { - m_gfxdecode->gfx(1)->transpen(m_helper,rect, + m_gfxdecode->gfx(1)->transpen(m_helper,rect, get_sprite_code(video_ram, j), 1, 0, 0, @@ -191,7 +191,7 @@ void sprint2_state::screen_eof_sprint2(screen_device &screen, bool state) get_sprite_y(video_ram, j), 0); } - m_gfxdecode->gfx(1)->transpen(m_helper,rect, + m_gfxdecode->gfx(1)->transpen(m_helper,rect, get_sprite_code(video_ram, i), 0, 0, 0, diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c index 28eb89a5a66..68eecae9767 100644 --- a/src/mame/video/sprint4.c +++ b/src/mame/video/sprint4.c @@ -74,7 +74,7 @@ UINT32 sprint4_state::screen_update_sprint4(screen_device &screen, bitmap_ind16 if (i & 1) bank = 32; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (code >> 3) | bank, (attr & 0x80) ? 4 : i, 0, 0, @@ -120,7 +120,7 @@ void sprint4_state::screen_eof_sprint4(screen_device &screen, bool state) if (i & 1) bank = 32; - m_gfxdecode->gfx(1)->transpen(m_helper,rect, + m_gfxdecode->gfx(1)->transpen(m_helper,rect, (code >> 3) | bank, 4, 0, 0, diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c index ab8d0d8dc48..546a940cfeb 100644 --- a/src/mame/video/sprint8.c +++ b/src/mame/video/sprint8.c @@ -138,7 +138,7 @@ void sprint8_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect if (code & 0x80) x |= 0x100; - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code ^ 7, i, !(code & 0x10), !(code & 0x08), diff --git a/src/mame/video/st0020.c b/src/mame/video/st0020.c index 2e4366fa5c0..aadca0551c0 100644 --- a/src/mame/video/st0020.c +++ b/src/mame/video/st0020.c @@ -382,7 +382,7 @@ void st0020_device::st0020_draw_zooming_sprites(running_machine &machine, bitmap { for (y = ystart; y != yend; y += yinc) { - m_gfxdecode->gfx(m_gfx_index)->zoom_transpen(bitmap,cliprect, + m_gfxdecode->gfx(m_gfx_index)->zoom_transpen(bitmap,cliprect, code++, color, flipx, flipy, diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c index 1d8b23c570a..b23d0e2053d 100644 --- a/src/mame/video/starshp1.c +++ b/src/mame/video/starshp1.c @@ -183,7 +183,7 @@ void starshp1_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { int code = (m_obj_ram[i] & 0xf) ^ 0xf; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code % 8, code / 8, 0, 0, @@ -209,7 +209,7 @@ void starshp1_state::draw_spaceship(bitmap_ind16 &bitmap, const rectangle &clipr if (y <= 0) y -= (yzoom * m_ship_voffset) >> 16; - m_gfxdecode->gfx(2)->zoom_transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->zoom_transpen(bitmap,cliprect, m_ship_picture & 0x03, m_ship_explode, m_ship_picture & 0x80, 0, diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index f331f8039a4..c08f3e2e146 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -378,7 +378,7 @@ void suna8_state::draw_normal_sprites(bitmap_ind16 &bitmap,const rectangle &clip sy = max_y - sy; tile_flipy = !tile_flipy; } - m_gfxdecode->gfx(which)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(which)->transpen(bitmap,cliprect, tile + (attr & 0x3)*0x100 + gfxbank, (((attr >> 2) & 0xf) | colorbank) + 0x10 * m_palettebank, // hardhea2 player2 tile_flipx, tile_flipy, diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index 99c2ea8001f..00aa81dce3a 100644 --- a/src/mame/video/superqix.c +++ b/src/mame/video/superqix.c @@ -175,7 +175,7 @@ void superqix_state::pbillian_draw_sprites(bitmap_ind16 &bitmap, const rectangle sy = 240 - sy; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flip_screen(), flip_screen(), @@ -206,7 +206,7 @@ void superqix_state::superqix_draw_sprites(bitmap_ind16 &bitmap,const rectangle flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c index 9ce9bc0e4f4..6acbe7ae7c8 100644 --- a/src/mame/video/suprridr.c +++ b/src/mame/video/suprridr.c @@ -207,7 +207,7 @@ UINT32 suprridr_state::screen_update_suprridr(screen_device &screen, bitmap_ind1 fy = !fy; y = 240 - y; } - m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, fx, fy, x, y, 0); + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, fx, fy, x, y, 0); } return 0; } diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c index abecea246c0..47c94432674 100644 --- a/src/mame/video/taito_b.c +++ b/src/mame/video/taito_b.c @@ -232,7 +232,7 @@ void taitob_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect if ( zoomx || zoomy ) { - m_gfxdecode->gfx(1)->zoom_transpen_raw(bitmap,cliprect, + m_gfxdecode->gfx(1)->zoom_transpen_raw(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c index 4eff11144ff..5aa697d1405 100644 --- a/src/mame/video/tank8.c +++ b/src/mame/video/tank8.c @@ -136,7 +136,7 @@ void tank8_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) int x = get_x_pos(i); int y = get_y_pos(i); - m_gfxdecode->gfx((code & 0x04) ? 2 : 3)->transpen(bitmap,cliprect, + m_gfxdecode->gfx((code & 0x04) ? 2 : 3)->transpen(bitmap,cliprect, code & 0x03, i, code & 0x10, diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c index 908dce3df8d..4aa46fe7623 100644 --- a/src/mame/video/tehkanwc.c +++ b/src/mame/video/tehkanwc.c @@ -148,7 +148,7 @@ void tehkanwc_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); } } diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index e4c9b6cc99a..eba5b914089 100644 --- a/src/mame/video/tiamc1.c +++ b/src/mame/video/tiamc1.c @@ -167,7 +167,7 @@ void tiamc1_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) spritecode = m_spriteram_n[offs] ^ 0xff; if (!(m_spriteram_a[offs] & 0x01)) - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, spritecode, 0, flipx, flipy, diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c index 254bab45f1d..fd6a99e1e8f 100644 --- a/src/mame/video/tp84.c +++ b/src/mame/video/tp84.c @@ -164,7 +164,7 @@ void tp84_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) int flip_x = ~m_spriteram[offs + 2] & 0x40; int flip_y = m_spriteram[offs + 2] & 0x80; - m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flip_x, flip_y, x, y, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flip_x, flip_y, x, y, colortable_get_transpen_mask(machine().colortable, m_gfxdecode->gfx(1), color, palette_base)); } diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index 2fa48efeba6..804b35b98ff 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -317,7 +317,7 @@ void travrusa_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(bitmap,clip, + m_gfxdecode->gfx(1)->transpen(bitmap,clip, code, attr & 0x0f, flipx, flipy, diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c index 2e17e020c13..59af52ac3f3 100644 --- a/src/mame/video/triplhnt.c +++ b/src/mame/video/triplhnt.c @@ -72,7 +72,7 @@ void triplhnt_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec /* render sprite to auxiliary bitmap */ - m_gfxdecode->gfx(m_sprite_zoom)->opaque(m_helper,cliprect, + m_gfxdecode->gfx(m_sprite_zoom)->opaque(m_helper,cliprect, 2 * code + m_sprite_bank, 0, code & 8, 0, rect.min_x, rect.min_y); diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c index 0f338425f0d..9421cfdd822 100644 --- a/src/mame/video/ultratnk.c +++ b/src/mame/video/ultratnk.c @@ -75,7 +75,7 @@ UINT32 ultratnk_state::screen_update_ultratnk(screen_device &screen, bitmap_ind1 if (!(attr & 0x80)) { - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (code >> 3) | bank, i, 0, 0, @@ -124,7 +124,7 @@ void ultratnk_state::screen_eof_ultratnk(screen_device &screen, bool state) if (code & 4) bank = 32; - m_gfxdecode->gfx(1)->transpen(m_helper,rect, + m_gfxdecode->gfx(1)->transpen(m_helper,rect, (code >> 3) | bank, 4, 0, 0, diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c index 3b991614c56..cad45eebab3 100644 --- a/src/mame/video/videopin.c +++ b/src/mame/video/videopin.c @@ -68,7 +68,7 @@ UINT32 videopin_state::screen_update_videopin(screen_device &screen, bitmap_ind1 { for (j = 0; j < 2; j++) { - m_gfxdecode->gfx(1)->transpen(bitmap,rect, + m_gfxdecode->gfx(1)->transpen(bitmap,rect, 0, 0, 0, 0, x + 16 * i, diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c index ab400827649..259663228cb 100644 --- a/src/mame/video/wc90.c +++ b/src/mame/video/wc90.c @@ -126,7 +126,7 @@ WRITE8_MEMBER(wc90_state::wc90_txvideoram_w) ***************************************************************************/ #define WC90_DRAW_SPRITE( code, sx, sy ) \ - m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, flags >> 4, \ + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, flags >> 4, \ bank&1, bank&2, sx, sy, 0 ) static const char p32x32[4][4] = { diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c index c161f6f43a1..d6049bea801 100644 --- a/src/mame/video/xorworld.c +++ b/src/mame/video/xorworld.c @@ -106,7 +106,7 @@ void xorworld_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec int code = (spriteram16[i+1] & 0x0ffc) >> 2; int color = (spriteram16[i+1] & 0xf000) >> 12; - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, 0, 0, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, 0, 0, sx, sy, 0); } } diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c index 76dce2a0905..52461ebe674 100644 --- a/src/mame/video/zac2650.c +++ b/src/mame/video/zac2650.c @@ -61,7 +61,7 @@ int zac2650_state::SpriteCollision(int first,int second) /* Draw first sprite */ - m_gfxdecode->gfx(expand)->opaque(m_spritebitmap,m_spritebitmap.cliprect(), + m_gfxdecode->gfx(expand)->opaque(m_spritebitmap,m_spritebitmap.cliprect(), first * 2, 0, 0,0, @@ -80,7 +80,7 @@ int zac2650_state::SpriteCollision(int first,int second) /* Blackout second sprite */ - m_gfxdecode->gfx(1)->transpen(m_spritebitmap,m_spritebitmap.cliprect(), + m_gfxdecode->gfx(1)->transpen(m_spritebitmap,m_spritebitmap.cliprect(), second * 2, 1, 0,0, @@ -99,7 +99,7 @@ int zac2650_state::SpriteCollision(int first,int second) /* Zero bitmap */ - m_gfxdecode->gfx(expand)->opaque(m_spritebitmap,m_spritebitmap.cliprect(), + m_gfxdecode->gfx(expand)->opaque(m_spritebitmap,m_spritebitmap.cliprect(), first * 2, 1, 0,0, @@ -161,7 +161,7 @@ void zac2650_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect int x,y; /* Sprite->Background collision detection */ - m_gfxdecode->gfx(expand)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(expand)->transpen(bitmap,cliprect, spriteno, 1, 0,0, @@ -180,7 +180,7 @@ void zac2650_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect } } - m_gfxdecode->gfx(expand)->transpen(bitmap,cliprect, + m_gfxdecode->gfx(expand)->transpen(bitmap,cliprect, spriteno, 0, 0,0, diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index 27b49f2174d..e4a5197b0fd 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -130,7 +130,7 @@ void zodiack_state::draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprec if (!(flip_screen() && m_percuss_hardware)) sy = 255 - sy; - m_gfxdecode->gfx(2)->transpen( + m_gfxdecode->gfx(2)->transpen( bitmap, cliprect, 0, /* this is just a dot, generated by the hardware */ diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c index 7a09a2ded6f..10fe4111ace 100644 --- a/src/mess/drivers/apexc.c +++ b/src/mess/drivers/apexc.c @@ -588,7 +588,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(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 239f4ed9df6..4e5eb7e2bbf 100644 --- a/src/mess/drivers/ax20.c +++ b/src/mess/drivers/ax20.c @@ -48,7 +48,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(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/itt3030.c b/src/mess/drivers/itt3030.c index 5c3e311395a..f7d05bfcff6 100644 --- a/src/mess/drivers/itt3030.c +++ b/src/mess/drivers/itt3030.c @@ -232,7 +232,7 @@ public: , m_keyrow15(*this, "ROW15") , m_keyrow16(*this, "ROW16") , m_vram(*this, "vram"), - m_gfxdecode(*this, "gfxdecode") + m_gfxdecode(*this, "gfxdecode") { } // devices @@ -360,7 +360,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(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/pv1000.c b/src/mess/drivers/pv1000.c index 630e7e314b4..4e18f66166e 100644 --- a/src/mess/drivers/pv1000.c +++ b/src/mess/drivers/pv1000.c @@ -354,12 +354,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(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(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/ti99_2.c b/src/mess/drivers/ti99_2.c index fe53cc6098a..feef1b342c5 100644 --- a/src/mess/drivers/ti99_2.c +++ b/src/mess/drivers/ti99_2.c @@ -178,7 +178,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(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 e9ec26b9037..55023b5859b 100644 --- a/src/mess/drivers/tk80bs.c +++ b/src/mess/drivers/tk80bs.c @@ -69,7 +69,7 @@ UINT32 tk80bs_state::screen_update_tk80bs(screen_device &screen, bitmap_ind16 &b { int tile = m_p_videoram[count++]; - m_gfxdecode->gfx(0)->opaque(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/ac1.c b/src/mess/video/ac1.c index 096cd86fc34..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(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(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 9fb9d18fa0f..82e85c01dd7 100644 --- a/src/mess/video/arcadia.c +++ b/src/mess/video/arcadia.c @@ -454,8 +454,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_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); + 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); } } } @@ -467,7 +467,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_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 62d6dcb943c..b46b6d1b60a 100644 --- a/src/mess/video/cgenie.c +++ b/src/mess/video/cgenie.c @@ -263,7 +263,7 @@ void cgenie_state::cgenie_refresh_monitor(bitmap_ind16 &bitmap, const rectangle { /* get graphics code */ code = videoram[i]; - m_gfxdecode->gfx(1)->opaque(bitmap,r, code, 0, + m_gfxdecode->gfx(1)->opaque(bitmap,r, code, 0, 0, 0, r.min_x, r.min_y); } else @@ -273,7 +273,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(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); } @@ -302,7 +302,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(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); } } @@ -343,9 +343,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_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_dlybitmap,r, code, 2, + m_gfxdecode->gfx(1)->opaque(m_dlybitmap,r, code, 2, 0, 0, r.min_x, r.min_y); } else @@ -355,9 +355,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_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_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); } @@ -387,9 +387,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_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_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 f96acdde205..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(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 b2a3bbd87b7..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(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 0ef908cc790..cd418092c03 100644 --- a/src/mess/video/intv.c +++ b/src/mess/video/intv.c @@ -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(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(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(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(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 fc73f62bcff..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(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 51c95b392d7..17f4aa466f5 100644 --- a/src/mess/video/mz700.c +++ b/src/mess/video/mz700.c @@ -62,7 +62,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(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/p2000m.c b/src/mess/video/p2000m.c index 2c5e8d3c638..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(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 369d8a73e73..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(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(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 6b499d833a0..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(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(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 93069764ec6..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(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(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(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(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(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(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 4287351807d..6d48c4766a0 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(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/tx0.c b/src/mess/video/tx0.c index 1f2be165672..0378340378c 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(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 9de08ae0332..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(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;