diff options
author | 2014-03-19 11:03:38 +0000 | |
---|---|---|
committer | 2014-03-19 11:03:38 +0000 | |
commit | f27a84da26c7dc7fb06de8306c7b235acaa647fd (patch) | |
tree | 50b71fc30250dd0431f1b1ad4f0bb155967f1f96 | |
parent | 9e73dd723ba03812672d90678218457982c8a9c0 (diff) |
Removed palette_device parameter from gfx draw methods. All draw methods now use m_palette (nw)
545 files changed, 1468 insertions, 1471 deletions
diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c index 16a0ceb6f35..54fdb95e5a0 100644 --- a/src/emu/drawgfx.c +++ b/src/emu/drawgfx.c @@ -584,7 +584,7 @@ void gfx_element::decode(UINT32 code) no transparency -------------------------------------------------*/ -void gfx_element::opaque(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::opaque(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty) { color = colorbase() + granularity() * (color % colors()); @@ -593,10 +593,10 @@ void gfx_element::opaque(palette_device &palette, bitmap_ind16 &dest, const rect DRAWGFX_CORE(UINT16, PIXEL_OP_REBASE_OPAQUE, NO_PRIORITY); } -void gfx_element::opaque(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::opaque(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty) { - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); code %= elements(); DECLARE_NO_PRIORITY; DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_OPAQUE, NO_PRIORITY); @@ -608,13 +608,13 @@ void gfx_element::opaque(palette_device &palette, bitmap_rgb32 &dest, const rect a single transparent pen -------------------------------------------------*/ -void gfx_element::transpen(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::transpen(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 trans_pen) { // special case invalid pens to opaque if (trans_pen > 0xff) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); // use pen usage to optimize code %= elements(); @@ -627,7 +627,7 @@ void gfx_element::transpen(palette_device &palette, bitmap_ind16 &dest, const re // fully opaque; draw as such if ((usage & (1 << trans_pen)) == 0) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); } // render @@ -636,13 +636,13 @@ void gfx_element::transpen(palette_device &palette, bitmap_ind16 &dest, const re DRAWGFX_CORE(UINT16, PIXEL_OP_REBASE_TRANSPEN, NO_PRIORITY); } -void gfx_element::transpen(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::transpen(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 trans_pen) { // special case invalid pens to opaque if (trans_pen > 0xff) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); // use pen usage to optimize code %= elements(); @@ -655,11 +655,11 @@ void gfx_element::transpen(palette_device &palette, bitmap_rgb32 &dest, const re // fully opaque; draw as such if ((usage & (1 << trans_pen)) == 0) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); } // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DECLARE_NO_PRIORITY; DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_TRANSPEN, NO_PRIORITY); } @@ -706,13 +706,13 @@ void gfx_element::transpen_raw(bitmap_rgb32 &dest, const rectangle &cliprect, a mask -------------------------------------------------*/ -void gfx_element::transmask(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::transmask(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 trans_mask) { // special case 0 mask to opaque if (trans_mask == 0) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); // use pen usage to optimize code %= elements(); @@ -725,7 +725,7 @@ void gfx_element::transmask(palette_device &palette, bitmap_ind16 &dest, const r // fully opaque; draw as such if ((usage & trans_mask) == 0) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); } // render @@ -734,13 +734,13 @@ void gfx_element::transmask(palette_device &palette, bitmap_ind16 &dest, const r DRAWGFX_CORE(UINT16, PIXEL_OP_REBASE_TRANSMASK, NO_PRIORITY); } -void gfx_element::transmask(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::transmask(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 trans_mask) { // special case 0 mask to opaque if (trans_mask == 0) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); // use pen usage to optimize code %= elements(); @@ -753,11 +753,11 @@ void gfx_element::transmask(palette_device &palette, bitmap_rgb32 &dest, const r // fully opaque; draw as such if ((usage & trans_mask) == 0) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); } // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DECLARE_NO_PRIORITY; DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_TRANSMASK, NO_PRIORITY); } @@ -769,27 +769,29 @@ void gfx_element::transmask(palette_device &palette, bitmap_rgb32 &dest, const r transparent, opaque, or shadowing -------------------------------------------------*/ -void gfx_element::transtable(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::transtable(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, - const UINT8 *pentable, const pen_t *shadowtable) + const UINT8 *pentable) { assert(pentable != NULL); // render color = colorbase() + granularity() * (color % colors()); + const pen_t *shadowtable = m_palette->shadow_table(); code %= elements(); DECLARE_NO_PRIORITY; DRAWGFX_CORE(UINT16, PIXEL_OP_REBASE_TRANSTABLE16, NO_PRIORITY); } -void gfx_element::transtable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::transtable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, - const UINT8 *pentable, const pen_t *shadowtable) + const UINT8 *pentable) { assert(pentable != NULL); // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); + const pen_t *shadowtable = m_palette->shadow_table(); code %= elements(); DECLARE_NO_PRIORITY; DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_TRANSTABLE32, NO_PRIORITY); @@ -802,13 +804,13 @@ void gfx_element::transtable(palette_device &palette, bitmap_rgb32 &dest, const remaining pixels with a fixed alpha value -------------------------------------------------*/ -void gfx_element::alpha(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::alpha(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 trans_pen, UINT8 alpha_val) { // special case alpha = 0xff if (alpha_val == 0xff) - return transpen(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, trans_pen); + return transpen(dest, cliprect, code, color, flipx, flipy, destx, desty, trans_pen); // early out if completely transparent code %= elements(); @@ -816,7 +818,7 @@ void gfx_element::alpha(palette_device &palette, bitmap_rgb32 &dest, const recta return; // get final code and color, and grab lookup tables - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DECLARE_NO_PRIORITY; DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_TRANSPEN_ALPHA32, NO_PRIORITY); } @@ -832,13 +834,13 @@ void gfx_element::alpha(palette_device &palette, bitmap_rgb32 &dest, const recta element with no transparency -------------------------------------------------*/ -void gfx_element::zoom_opaque(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::zoom_opaque(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); // render color = colorbase() + granularity() * (color % colors()); @@ -847,16 +849,16 @@ void gfx_element::zoom_opaque(palette_device &palette, bitmap_ind16 &dest, const DRAWGFXZOOM_CORE(UINT16, PIXEL_OP_REBASE_OPAQUE, NO_PRIORITY); } -void gfx_element::zoom_opaque(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::zoom_opaque(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty); + return opaque(dest, cliprect, code, color, flipx, flipy, destx, desty); // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); code %= elements(); DECLARE_NO_PRIORITY; DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_OPAQUE, NO_PRIORITY); @@ -868,17 +870,17 @@ void gfx_element::zoom_opaque(palette_device &palette, bitmap_rgb32 &dest, const element with a single transparent pen -------------------------------------------------*/ -void gfx_element::zoom_transpen(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::zoom_transpen(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 trans_pen) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return transpen(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, trans_pen); + return transpen(dest, cliprect, code, color, flipx, flipy, destx, desty, trans_pen); // special case invalid pens to opaque if (trans_pen > 0xff) - return zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); + return zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); // use pen usage to optimize code %= elements(); @@ -891,7 +893,7 @@ void gfx_element::zoom_transpen(palette_device &palette, bitmap_ind16 &dest, con // fully opaque; draw as such if ((usage & (1 << trans_pen)) == 0) - return zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); + return zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); } // render @@ -900,17 +902,17 @@ void gfx_element::zoom_transpen(palette_device &palette, bitmap_ind16 &dest, con DRAWGFXZOOM_CORE(UINT16, PIXEL_OP_REBASE_TRANSPEN, NO_PRIORITY); } -void gfx_element::zoom_transpen(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::zoom_transpen(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 trans_pen) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return transpen(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, trans_pen); + return transpen(dest, cliprect, code, color, flipx, flipy, destx, desty, trans_pen); // special case invalid pens to opaque if (trans_pen > 0xff) - return zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); + return zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); // use pen usage to optimize code %= elements(); @@ -923,11 +925,11 @@ void gfx_element::zoom_transpen(palette_device &palette, bitmap_rgb32 &dest, con // fully opaque; draw as such if ((usage & (1 << trans_pen)) == 0) - return zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); + return zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); } // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DECLARE_NO_PRIORITY; DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_TRANSPEN, NO_PRIORITY); } @@ -982,17 +984,17 @@ void gfx_element::zoom_transpen_raw(bitmap_rgb32 &dest, const rectangle &cliprec provided as a mask -------------------------------------------------*/ -void gfx_element::zoom_transmask(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::zoom_transmask(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 trans_mask) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return transmask(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, trans_mask); + return transmask(dest, cliprect, code, color, flipx, flipy, destx, desty, trans_mask); // special case 0 mask to opaque if (trans_mask == 0) - return zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); + return zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); // use pen usage to optimize code %= elements(); @@ -1005,7 +1007,7 @@ void gfx_element::zoom_transmask(palette_device &palette, bitmap_ind16 &dest, co // fully opaque; draw as such if ((usage & trans_mask) == 0) - return zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); + return zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); } // render @@ -1014,17 +1016,17 @@ void gfx_element::zoom_transmask(palette_device &palette, bitmap_ind16 &dest, co DRAWGFXZOOM_CORE(UINT16, PIXEL_OP_REBASE_TRANSMASK, NO_PRIORITY); } -void gfx_element::zoom_transmask(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::zoom_transmask(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 trans_mask) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return transmask(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, trans_mask); + return transmask(dest, cliprect, code, color, flipx, flipy, destx, desty, trans_mask); // special case 0 mask to opaque if (trans_mask == 0) - return zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); + return zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); // use pen usage to optimize code %= elements(); @@ -1037,11 +1039,11 @@ void gfx_element::zoom_transmask(palette_device &palette, bitmap_rgb32 &dest, co // fully opaque; draw as such if ((usage & trans_mask) == 0) - return zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); + return zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley); } // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DECLARE_NO_PRIORITY; DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_TRANSMASK, NO_PRIORITY); } @@ -1053,35 +1055,37 @@ void gfx_element::zoom_transmask(palette_device &palette, bitmap_rgb32 &dest, co are transparent, opaque, or shadowing -------------------------------------------------*/ -void gfx_element::zoom_transtable(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::zoom_transtable(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, - UINT32 scalex, UINT32 scaley, const UINT8 *pentable, const pen_t *shadowtable) + UINT32 scalex, UINT32 scaley, const UINT8 *pentable) { assert(pentable != NULL); // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return transtable(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, pentable, shadowtable); + return transtable(dest, cliprect, code, color, flipx, flipy, destx, desty, pentable); // render color = colorbase() + granularity() * (color % colors()); + const pen_t *shadowtable = m_palette->shadow_table(); code %= elements(); DECLARE_NO_PRIORITY; DRAWGFXZOOM_CORE(UINT16, PIXEL_OP_REBASE_TRANSTABLE16, NO_PRIORITY); } -void gfx_element::zoom_transtable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::zoom_transtable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, - UINT32 scalex, UINT32 scaley, const UINT8 *pentable, const pen_t *shadowtable) + UINT32 scalex, UINT32 scaley, const UINT8 *pentable) { assert(pentable != NULL); // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return transtable(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, pentable, shadowtable); + return transtable(dest, cliprect, code, color, flipx, flipy, destx, desty, pentable); // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); + const pen_t *shadowtable = m_palette->shadow_table(); code %= elements(); DECLARE_NO_PRIORITY; DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_TRANSTABLE32, NO_PRIORITY); @@ -1094,17 +1098,17 @@ void gfx_element::zoom_transtable(palette_device &palette, bitmap_rgb32 &dest, c the remaining pixels with a fixed alpha value -------------------------------------------------*/ -void gfx_element::zoom_alpha(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::zoom_alpha(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 trans_pen, UINT8 alpha_val) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return alpha(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, trans_pen, alpha_val); + return alpha(dest, cliprect, code, color, flipx, flipy, destx, desty, trans_pen, alpha_val); // special case alpha_val = 0xff if (alpha_val == 0xff) - return zoom_transpen(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, trans_pen); + return zoom_transpen(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, trans_pen); // early out if completely transparent code %= elements(); @@ -1112,7 +1116,7 @@ void gfx_element::zoom_alpha(palette_device &palette, bitmap_rgb32 &dest, const return; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DECLARE_NO_PRIORITY; DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_TRANSPEN_ALPHA32, NO_PRIORITY); } @@ -1129,7 +1133,7 @@ void gfx_element::zoom_alpha(palette_device &palette, bitmap_rgb32 &dest, const bitmap -------------------------------------------------*/ -void gfx_element::prio_opaque(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::prio_opaque(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask) { @@ -1142,7 +1146,7 @@ void gfx_element::prio_opaque(palette_device &palette, bitmap_ind16 &dest, const DRAWGFX_CORE(UINT16, PIXEL_OP_REBASE_OPAQUE_PRIORITY, UINT8); } -void gfx_element::prio_opaque(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_opaque(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask) { @@ -1150,7 +1154,7 @@ void gfx_element::prio_opaque(palette_device &palette, bitmap_rgb32 &dest, const pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); code %= elements(); DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_OPAQUE_PRIORITY, UINT8); } @@ -1162,13 +1166,13 @@ void gfx_element::prio_opaque(palette_device &palette, bitmap_rgb32 &dest, const priority bitmap -------------------------------------------------*/ -void gfx_element::prio_transpen(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::prio_transpen(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen) { // special case invalid pens to opaque if (trans_pen > 0xff) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); // use pen usage to optimize code %= elements(); @@ -1181,7 +1185,7 @@ void gfx_element::prio_transpen(palette_device &palette, bitmap_ind16 &dest, con // fully opaque; draw as such if ((usage & (1 << trans_pen)) == 0) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); } // high bit of the mask is implicitly on @@ -1192,13 +1196,13 @@ void gfx_element::prio_transpen(palette_device &palette, bitmap_ind16 &dest, con DRAWGFX_CORE(UINT16, PIXEL_OP_REBASE_TRANSPEN_PRIORITY, UINT8); } -void gfx_element::prio_transpen(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_transpen(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen) { // special case invalid pens to opaque if (trans_pen > 0xff) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); // use pen usage to optimize code %= elements(); @@ -1211,14 +1215,14 @@ void gfx_element::prio_transpen(palette_device &palette, bitmap_rgb32 &dest, con // fully opaque; draw as such if ((usage & (1 << trans_pen)) == 0) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); } // high bit of the mask is implicitly on pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_TRANSPEN_PRIORITY, UINT8); } @@ -1268,13 +1272,13 @@ void gfx_element::prio_transpen_raw(bitmap_rgb32 &dest, const rectangle &cliprec a mask, checking against the priority bitmap -------------------------------------------------*/ -void gfx_element::prio_transmask(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::prio_transmask(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_mask) { // special case 0 mask to opaque if (trans_mask == 0) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); // use pen usage to optimize code %= elements(); @@ -1287,7 +1291,7 @@ void gfx_element::prio_transmask(palette_device &palette, bitmap_ind16 &dest, co // fully opaque; draw as such if ((usage & trans_mask) == 0) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); } // high bit of the mask is implicitly on @@ -1298,13 +1302,13 @@ void gfx_element::prio_transmask(palette_device &palette, bitmap_ind16 &dest, co DRAWGFX_CORE(UINT16, PIXEL_OP_REBASE_TRANSMASK_PRIORITY, UINT8); } -void gfx_element::prio_transmask(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_transmask(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_mask) { // special case 0 mask to opaque if (trans_mask == 0) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); // use pen usage to optimize code %= elements(); @@ -1317,14 +1321,14 @@ void gfx_element::prio_transmask(palette_device &palette, bitmap_rgb32 &dest, co // fully opaque; draw as such if ((usage & trans_mask) == 0) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); } // high bit of the mask is implicitly on pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_TRANSMASK_PRIORITY, UINT8); } @@ -1336,9 +1340,9 @@ void gfx_element::prio_transmask(palette_device &palette, bitmap_rgb32 &dest, co against the priority bitmap -------------------------------------------------*/ -void gfx_element::prio_transtable(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::prio_transtable(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, - bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable, const pen_t *shadowtable) + bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable) { assert(pentable != NULL); @@ -1347,13 +1351,14 @@ void gfx_element::prio_transtable(palette_device &palette, bitmap_ind16 &dest, c // render color = colorbase() + granularity() * (color % colors()); + const pen_t *shadowtable = m_palette->shadow_table(); code %= elements(); DRAWGFX_CORE(UINT16, PIXEL_OP_REBASE_TRANSTABLE16_PRIORITY, UINT8); } -void gfx_element::prio_transtable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_transtable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, - bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable, const pen_t *shadowtable) + bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable) { assert(pentable != NULL); @@ -1361,7 +1366,8 @@ void gfx_element::prio_transtable(palette_device &palette, bitmap_rgb32 &dest, c pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); + const pen_t *shadowtable = m_palette->shadow_table(); code %= elements(); DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_TRANSTABLE32_PRIORITY, UINT8); } @@ -1374,13 +1380,13 @@ void gfx_element::prio_transtable(palette_device &palette, bitmap_rgb32 &dest, c checking against the priority bitmap -------------------------------------------------*/ -void gfx_element::prio_alpha(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_alpha(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen, UINT8 alpha_val) { // special case alpha = 0xff if (alpha_val == 0xff) - return prio_transpen(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen); + return prio_transpen(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen); // early out if completely transparent code %= elements(); @@ -1391,7 +1397,7 @@ void gfx_element::prio_alpha(palette_device &palette, bitmap_rgb32 &dest, const pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DRAWGFX_CORE(UINT32, PIXEL_OP_REMAP_TRANSPEN_ALPHA32_PRIORITY, UINT8); } @@ -1407,13 +1413,13 @@ void gfx_element::prio_alpha(palette_device &palette, bitmap_rgb32 &dest, const the priority bitmap -------------------------------------------------*/ -void gfx_element::prio_zoom_opaque(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_opaque(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); // high bit of the mask is implicitly on pmask |= 1 << 31; @@ -1424,19 +1430,19 @@ void gfx_element::prio_zoom_opaque(palette_device &palette, bitmap_ind16 &dest, DRAWGFXZOOM_CORE(UINT16, PIXEL_OP_REBASE_OPAQUE_PRIORITY, UINT8); } -void gfx_element::prio_zoom_opaque(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_opaque(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return prio_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); + return prio_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask); // high bit of the mask is implicitly on pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); code %= elements(); DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_OPAQUE_PRIORITY, UINT8); } @@ -1448,18 +1454,18 @@ void gfx_element::prio_zoom_opaque(palette_device &palette, bitmap_rgb32 &dest, checking against the priority bitmap -------------------------------------------------*/ -void gfx_element::prio_zoom_transpen(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_transpen(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return prio_transpen(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen); + return prio_transpen(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen); // special case invalid pens to opaque if (trans_pen > 0xff) - return prio_zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); + return prio_zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); // use pen usage to optimize code %= elements(); @@ -1472,7 +1478,7 @@ void gfx_element::prio_zoom_transpen(palette_device &palette, bitmap_ind16 &dest // fully opaque; draw as such if ((usage & (1 << trans_pen)) == 0) - return prio_zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); + return prio_zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); } // high bit of the mask is implicitly on @@ -1483,18 +1489,18 @@ void gfx_element::prio_zoom_transpen(palette_device &palette, bitmap_ind16 &dest DRAWGFXZOOM_CORE(UINT16, PIXEL_OP_REBASE_TRANSPEN_PRIORITY, UINT8); } -void gfx_element::prio_zoom_transpen(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_transpen(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return prio_transpen(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen); + return prio_transpen(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen); // special case invalid pens to opaque if (trans_pen > 0xff) - return prio_zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); + return prio_zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); // use pen usage to optimize code %= elements(); @@ -1507,14 +1513,14 @@ void gfx_element::prio_zoom_transpen(palette_device &palette, bitmap_rgb32 &dest // fully opaque; draw as such if ((usage & (1 << trans_pen)) == 0) - return prio_zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); + return prio_zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); } // high bit of the mask is implicitly on pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_TRANSPEN_PRIORITY, UINT8); } @@ -1576,18 +1582,18 @@ void gfx_element::prio_zoom_transpen_raw(bitmap_rgb32 &dest, const rectangle &cl priority bitmap -------------------------------------------------*/ -void gfx_element::prio_zoom_transmask(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_transmask(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_mask) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return prio_transmask(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_mask); + return prio_transmask(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_mask); // special case 0 mask to opaque if (trans_mask == 0) - return prio_zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); + return prio_zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); // use pen usage to optimize code %= elements(); @@ -1600,7 +1606,7 @@ void gfx_element::prio_zoom_transmask(palette_device &palette, bitmap_ind16 &des // fully opaque; draw as such if ((usage & trans_mask) == 0) - return prio_zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); + return prio_zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); } // high bit of the mask is implicitly on @@ -1611,18 +1617,18 @@ void gfx_element::prio_zoom_transmask(palette_device &palette, bitmap_ind16 &des DRAWGFXZOOM_CORE(UINT16, PIXEL_OP_REBASE_TRANSMASK_PRIORITY, UINT8); } -void gfx_element::prio_zoom_transmask(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_transmask(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_mask) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return prio_transmask(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_mask); + return prio_transmask(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_mask); // special case 0 mask to opaque if (trans_mask == 0) - return prio_zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); + return prio_zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); // use pen usage to optimize code %= elements(); @@ -1635,14 +1641,14 @@ void gfx_element::prio_zoom_transmask(palette_device &palette, bitmap_rgb32 &des // fully opaque; draw as such if ((usage & trans_mask) == 0) - return prio_zoom_opaque(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); + return prio_zoom_opaque(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask); } // high bit of the mask is implicitly on pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_TRANSMASK_PRIORITY, UINT8); } @@ -1654,42 +1660,44 @@ void gfx_element::prio_zoom_transmask(palette_device &palette, bitmap_rgb32 &des checking against the priority bitmap -------------------------------------------------*/ -void gfx_element::prio_zoom_transtable(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_transtable(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, - const UINT8 *pentable, const pen_t *shadowtable) + const UINT8 *pentable) { assert(pentable != NULL); // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return prio_transtable(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, pentable, shadowtable); + return prio_transtable(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, pentable); // high bit of the mask is implicitly on pmask |= 1 << 31; // render color = colorbase() + granularity() * (color % colors()); + const pen_t *shadowtable = m_palette->shadow_table(); code %= elements(); DRAWGFXZOOM_CORE(UINT16, PIXEL_OP_REBASE_TRANSTABLE16_PRIORITY, UINT8); } -void gfx_element::prio_zoom_transtable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_transtable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, - const UINT8 *pentable, const pen_t *shadowtable) + const UINT8 *pentable) { assert(pentable != NULL); // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return prio_transtable(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, pentable, shadowtable); + return prio_transtable(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, pentable); // high bit of the mask is implicitly on pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); + const pen_t *shadowtable = m_palette->shadow_table(); code %= elements(); DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_TRANSTABLE32_PRIORITY, UINT8); } @@ -1703,18 +1711,18 @@ void gfx_element::prio_zoom_transtable(palette_device &palette, bitmap_rgb32 &de bitmap -------------------------------------------------*/ -void gfx_element::prio_zoom_alpha(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_alpha(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen, UINT8 alpha_val) { // non-zoom case if (scalex == 0x10000 && scaley == 0x10000) - return prio_alpha(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen, alpha_val); + return prio_alpha(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen, alpha_val); // special case alpha_val = 0xff if (alpha_val == 0xff) - return prio_zoom_transpen(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask, trans_pen); + return prio_zoom_transpen(dest, cliprect, code, color, flipx, flipy, destx, desty, scalex, scaley, priority, pmask, trans_pen); // early out if completely transparent code %= elements(); @@ -1725,7 +1733,7 @@ void gfx_element::prio_zoom_alpha(palette_device &palette, bitmap_rgb32 &dest, c pmask |= 1 << 31; // render - const pen_t *paldata = &palette.pen(colorbase() + granularity() * (color % colors())); + const pen_t *paldata = m_palette->pens() + colorbase() + granularity() * (color % colors()); DRAWGFXZOOM_CORE(UINT32, PIXEL_OP_REMAP_TRANSPEN_ALPHA32_PRIORITY, UINT8); } @@ -1756,7 +1764,7 @@ do } \ while (0) -void gfx_element::prio_transpen_additive(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_transpen_additive(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen) { @@ -1768,7 +1776,7 @@ void gfx_element::prio_transpen_additive(palette_device &palette, bitmap_rgb32 & /* get final code and color, and grab lookup tables */ code %= elements(); color %= colors(); - paldata = &palette.pen(colorbase() + granularity() * color); + paldata = m_palette->pens() + colorbase() + granularity() * color; /* use pen usage to optimize */ if (has_pen_usage()) @@ -1788,7 +1796,7 @@ void gfx_element::prio_transpen_additive(palette_device &palette, bitmap_rgb32 & } -void gfx_element::prio_zoom_transpen_additive(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::prio_zoom_transpen_additive(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen) @@ -1799,7 +1807,7 @@ void gfx_element::prio_zoom_transpen_additive(palette_device &palette, bitmap_rg if (scalex == 0x10000 && scaley == 0x10000) { - prio_transpen_additive(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen); + prio_transpen_additive(dest, cliprect, code, color, flipx, flipy, destx, desty, priority, pmask, trans_pen); return; } @@ -1809,7 +1817,7 @@ void gfx_element::prio_zoom_transpen_additive(palette_device &palette, bitmap_rg /* get final code and color, and grab lookup tables */ code %= elements(); color %= colors(); - paldata = &palette.pen(colorbase() + granularity() * color); + paldata = m_palette->pens() + colorbase() + granularity() * color; /* use pen usage to optimize */ if (has_pen_usage()) @@ -1863,7 +1871,7 @@ while (0) a single transparent pen, storing the alpha value in alpha field of ARGB32, negative alpha implies alphatable -------------------------------------------------*/ -void gfx_element::alphastore(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::alphastore(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, int fixedalpha, UINT8 *alphatable) { @@ -1877,14 +1885,14 @@ void gfx_element::alphastore(palette_device &palette, bitmap_rgb32 &dest, const /* if we have a fixed alpha, call the standard drawgfx_transpen */ if (fixedalpha == 0xff) { - transpen(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, 0); + transpen(dest, cliprect, code, color, flipx, flipy, destx, desty, 0); return; } /* get final code and color, and grab lookup tables */ code %= elements(); color %= colors(); - paldata = &palette.pen(colorbase() + granularity() * color); + paldata = m_palette->pens() + colorbase() + granularity() * color; /* early out if completely transparent */ if (has_pen_usage() && (pen_usage(code) & ~(1 << 0)) == 0) @@ -1906,7 +1914,7 @@ void gfx_element::alphastore(palette_device &palette, bitmap_rgb32 &dest, const a fixed alpha value, or if alpha==-1 then uses the per-pen alphatable[] array -------------------------------------------------*/ -void gfx_element::alphatable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, +void gfx_element::alphatable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, int fixedalpha ,UINT8 *alphatable) { @@ -1917,7 +1925,7 @@ void gfx_element::alphatable(palette_device &palette, bitmap_rgb32 &dest, const /* if we have a fixed alpha, call the standard drawgfx_alpha */ if (fixedalpha >= 0) { - alpha(palette, dest, cliprect, code, color, flipx, flipy, destx, desty, 0, fixedalpha); + alpha(dest, cliprect, code, color, flipx, flipy, destx, desty, 0, fixedalpha); return; } @@ -1927,7 +1935,7 @@ void gfx_element::alphatable(palette_device &palette, bitmap_rgb32 &dest, const /* get final code and color, and grab lookup tables */ code %= elements(); color %= colors(); - paldata = &palette.pen(colorbase() + granularity() * color); + paldata = m_palette->pens() + colorbase() + granularity() * color; /* early out if completely transparent */ if (has_pen_usage() && (pen_usage(code) & ~(1 << 0)) == 0) diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h index 0b5ef4b03b2..911805dff00 100644 --- a/src/emu/drawgfx.h +++ b/src/emu/drawgfx.h @@ -187,68 +187,68 @@ public: // ----- core graphics drawing ----- // specific drawgfx implementations for each transparency type - void opaque(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty); - void opaque(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty); - void transpen(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transpen); - void transpen(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transpen); + void opaque(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty); + void opaque(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty); + void transpen(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transpen); + void transpen(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transpen); void transpen_raw(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transpen); void transpen_raw(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transpen); - void transmask(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transmask); - void transmask(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transmask); - void transtable(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, const UINT8 *pentable, const pen_t *shadowtable); - void transtable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, const UINT8 *pentable, const pen_t *shadowtable); - void alpha(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transpen, UINT8 alpha); + void transmask(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transmask); + void transmask(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transmask); + void transtable(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, const UINT8 *pentable); + void transtable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, const UINT8 *pentable); + void alpha(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 transpen, UINT8 alpha); // ----- zoomed graphics drawing ----- // specific zoom implementations for each transparency type - void zoom_opaque(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley); - void zoom_opaque(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley); - void zoom_transpen(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transpen); - void zoom_transpen(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transpen); + void zoom_opaque(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley); + void zoom_opaque(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley); + void zoom_transpen(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transpen); + void zoom_transpen(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transpen); void zoom_transpen_raw(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transpen); void zoom_transpen_raw(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transpen); - void zoom_transmask(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transmask); - void zoom_transmask(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transmask); - void zoom_transtable(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, const UINT8 *pentable, const pen_t *shadowtable); - void zoom_transtable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, const UINT8 *pentable, const pen_t *shadowtable); - void zoom_alpha(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transpen, UINT8 alpha); + void zoom_transmask(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transmask); + void zoom_transmask(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transmask); + void zoom_transtable(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, const UINT8 *pentable); + void zoom_transtable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, const UINT8 *pentable); + void zoom_alpha(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, UINT32 transpen, UINT8 alpha); // ----- priority masked graphics drawing ----- // specific prio implementations for each transparency type - void prio_opaque(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask); - void prio_opaque(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask); - void prio_transpen(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); - void prio_transpen(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); + void prio_opaque(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask); + void prio_opaque(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask); + void prio_transpen(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); + void prio_transpen(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); void prio_transpen_raw(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); void prio_transpen_raw(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); - void prio_transmask(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transmask); - void prio_transmask(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transmask); - void prio_transtable(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable, const pen_t *shadowtable); - void prio_transtable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable, const pen_t *shadowtable); - void prio_alpha(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen, UINT8 alpha); + void prio_transmask(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transmask); + void prio_transmask(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transmask); + void prio_transtable(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable); + void prio_transtable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable); + void prio_alpha(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen, UINT8 alpha); // ----- priority masked zoomed graphics drawing ----- // specific prio_zoom implementations for each transparency type - void prio_zoom_opaque(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask); - void prio_zoom_opaque(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask); - void prio_zoom_transpen(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); - void prio_zoom_transpen(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); + void prio_zoom_opaque(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask); + void prio_zoom_opaque(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask); + void prio_zoom_transpen(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); + void prio_zoom_transpen(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); void prio_zoom_transpen_raw(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); void prio_zoom_transpen_raw(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen); - void prio_zoom_transmask(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transmask); - void prio_zoom_transmask(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transmask); - void prio_zoom_transtable(palette_device &palette, bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable, const pen_t *shadowtable); - void prio_zoom_transtable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable, const pen_t *shadowtable); - void prio_zoom_alpha(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen, UINT8 alpha); + void prio_zoom_transmask(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transmask); + void prio_zoom_transmask(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transmask); + void prio_zoom_transtable(bitmap_ind16 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable); + void prio_zoom_transtable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, const UINT8 *pentable); + void prio_zoom_alpha(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask, UINT32 transpen, UINT8 alpha); // implementations moved here from specific drivers - void prio_transpen_additive(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen); - void prio_zoom_transpen_additive(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect,UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty,UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask,UINT32 trans_pen); - void alphastore(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect,UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty,int fixedalpha, UINT8 *alphatable); - void alphatable(palette_device &palette, bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, int fixedalpha ,UINT8 *alphatable); + void prio_transpen_additive(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, bitmap_ind8 &priority, UINT32 pmask, UINT32 trans_pen); + void prio_zoom_transpen_additive(bitmap_rgb32 &dest, const rectangle &cliprect,UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty,UINT32 scalex, UINT32 scaley, bitmap_ind8 &priority, UINT32 pmask,UINT32 trans_pen); + void alphastore(bitmap_rgb32 &dest, const rectangle &cliprect,UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty,int fixedalpha, UINT8 *alphatable); + void alphatable(bitmap_rgb32 &dest, const rectangle &cliprect, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, int fixedalpha ,UINT8 *alphatable); private: // internal helpers void decode(UINT32 code); diff --git a/src/emu/machine/tc009xlvc.c b/src/emu/machine/tc009xlvc.c index 6a2a6b2132b..fd1aa40d3ad 100644 --- a/src/emu/machine/tc009xlvc.c +++ b/src/emu/machine/tc009xlvc.c @@ -336,7 +336,7 @@ void tc0091lvc_device::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap fy = !fy; } - gfx->prio_transpen(m_palette,bitmap,cliprect,spr_offs,col,fx,fy,x,y,screen.priority(),(col & 0x08) ? 0xaa : 0x00,0); + gfx->prio_transpen(bitmap,cliprect,spr_offs,col,fx,fy,x,y,screen.priority(),(col & 0x08) ? 0xaa : 0x00,0); } } diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index bf77aa67be4..fee80fe7653 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -120,10 +120,10 @@ void k3_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) ypos = (source[0] & 0x00ff) >> 0; tileno = (source2[0] & 0x7ffe) >> 1; xpos |= (source2[0] & 0x0001) << 8; - gfx->transpen(m_palette,bitmap,cliprect, tileno, 1, 0, 0, xpos, ypos, 0); - gfx->transpen(m_palette,bitmap,cliprect, tileno, 1, 0, 0, xpos, ypos - 0x100, 0); // wrap - gfx->transpen(m_palette,bitmap,cliprect, tileno, 1, 0, 0, xpos - 0x200, ypos, 0); // wrap - gfx->transpen(m_palette,bitmap,cliprect, tileno, 1, 0, 0, xpos - 0x200, ypos - 0x100, 0); // wrap + gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos, ypos, 0); + gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos, ypos - 0x100, 0); // wrap + gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos - 0x200, ypos, 0); // wrap + gfx->transpen(bitmap,cliprect, tileno, 1, 0, 0, xpos - 0x200, ypos - 0x100, 0); // wrap source++; source2++; diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index deba8c521bc..1491f66151d 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -99,19 +99,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, 0, 0, 0, 0, m_objpos[0], m_objpos[1]); - m_gfxdecode->gfx(2)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->opaque(bitmap,cliprect, 0, 0, 0, 0, m_objpos[2], m_objpos[3]); - m_gfxdecode->gfx(3)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->opaque(bitmap,cliprect, 0, 0, 0, 0, @@ -119,7 +119,7 @@ UINT32 aceal_state::screen_update_ace(screen_device &screen, bitmap_ind16 &bitma for (offs = 0; offs < 8; offs++) { - m_gfxdecode->gfx(4)->opaque(m_palette,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 7ce2fa2792d..669d1260996 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -134,7 +134,7 @@ UINT32 acefruit_state::screen_update_acefruit(screen_device &screen, bitmap_ind1 if( color < 0x4 ) { - m_gfxdecode->gfx(1)->opaque(m_palette,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/acommand.c b/src/mame/drivers/acommand.c index 1e74a245df4..440e9542d1c 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -177,7 +177,7 @@ void acommand_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec xx = w; do { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index d7d7fdab6a1..d0b1287360d 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -89,7 +89,7 @@ void albazc_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,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/amaticmg.c b/src/mame/drivers/amaticmg.c index 9e0bfda7dda..56d1ea794fb 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -490,7 +490,7 @@ UINT32 amaticmg_state::screen_update_amaticmg(screen_device &screen, bitmap_ind1 /* TODO: this looks so out of place ... */ color = (m_attr[count]&0xf0)>>3; - gfx->opaque(m_palette,bitmap,cliprect,tile,color,0,0,x*4,y*8); + gfx->opaque(bitmap,cliprect,tile,color,0,0,x*4,y*8); count++; } } @@ -514,7 +514,7 @@ UINT32 amaticmg_state::screen_update_amaticmg2(screen_device &screen, bitmap_ind tile += ((m_attr[count]&0xff)<<8); color = 0; - gfx->opaque(m_palette,bitmap,cliprect,tile,color,0,0,x*4,y*8); + gfx->opaque(bitmap,cliprect,tile,color,0,0,x*4,y*8); count++; } } diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index c9c4f849f3d..cd5410dc1b8 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -428,7 +428,7 @@ UINT32 aristmk4_state::screen_update_aristmk4(screen_device &screen, bitmap_ind1 // as we only update the background, not the entire display. flipx = ((m_mkiv_vram[count]) & 0x04); flipy = ((m_mkiv_vram[count]) & 0x08); - gfx->opaque(m_palette,bitmap,cliprect,tile,color,flipx,flipy,(38-x-1)<<3,(27-y-1)<<3); + gfx->opaque(bitmap,cliprect,tile,color,flipx,flipy,(38-x-1)<<3,(27-y-1)<<3); count+=2; } } diff --git a/src/mame/drivers/astrcorp.c b/src/mame/drivers/astrcorp.c index b676f17bb2e..787066a31f5 100644 --- a/src/mame/drivers/astrcorp.c +++ b/src/mame/drivers/astrcorp.c @@ -150,7 +150,7 @@ void astrocorp_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clipre { for (xwrap = 0 ; xwrap <= 0x200 ; xwrap += 0x200) { - m_gfxdecode->gfx(0)->transpen(m_palette,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/avt.c b/src/mame/drivers/avt.c index cda51994b6f..5f4aac83359 100644 --- a/src/mame/drivers/avt.c +++ b/src/mame/drivers/avt.c @@ -525,7 +525,7 @@ UINT32 avt_state::screen_update_avt(screen_device &screen, bitmap_ind16 &bitmap, UINT16 tile = m_videoram[count] | ((m_colorram[count] & 1) << 8); UINT8 color = (m_colorram[count] & 0xf0) >> 4; - gfx->opaque(m_palette,bitmap,cliprect,tile,color,0,0,x*8,(y*8)); + gfx->opaque(bitmap,cliprect,tile,color,0,0,x*8,(y*8)); count++; } diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index ac8334928f8..55faff88eed 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -154,26 +154,26 @@ void bestleag_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if(m_vregs[0x00/2] & 0x1000) color &= 7; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, 0, flipx ? (sx+16) : (sx),sy,15); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code+1, color, flipx, 0, flipx ? (sx) : (sx+16),sy,15); /* wraparound x */ - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, 0, flipx ? (sx+16 - 512) : (sx - 512),sy,15); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code+1, color, flipx, 0, diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index e8d3180bdc8..d2a232904b8 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -240,11 +240,11 @@ void blackt96_state::draw_strip(bitmap_ind16 &bitmap, const rectangle &cliprect, if (tile&0x2000) { - gfxbg->transpen(m_palette,bitmap,cliprect,tile&0x1fff,colour>>4,flipx,0,xx,yy+y*16,0); + gfxbg->transpen(bitmap,cliprect,tile&0x1fff,colour>>4,flipx,0,xx,yy+y*16,0); } else { - gfxspr->transpen(m_palette,bitmap,cliprect,tile&0x1fff,colour,flipx,0,xx,yy+y*16,0); + gfxspr->transpen(bitmap,cliprect,tile&0x1fff,colour,flipx,0,xx,yy+y*16,0); } } } @@ -277,7 +277,7 @@ UINT32 blackt96_state::screen_update_blackt96(screen_device &screen, bitmap_ind1 { UINT16 tile = (m_tilemapram[count*2]&0xff); tile += m_txt_bank * 0x100; - gfx->transpen(m_palette,bitmap,cliprect,tile,0,0,0,x*8,-16+y*8,0); + gfx->transpen(bitmap,cliprect,tile,0,0,0,x*8,-16+y*8,0); count++; } } diff --git a/src/mame/drivers/bmcpokr.c b/src/mame/drivers/bmcpokr.c index 91f6b9c52ed..970e150f9b9 100644 --- a/src/mame/drivers/bmcpokr.c +++ b/src/mame/drivers/bmcpokr.c @@ -215,7 +215,7 @@ UINT32 bmcpokr_state::screen_update_bmcpokr(screen_device &screen, bitmap_ind16 UINT16 data = m_videoram[count]; count++; - gfx->opaque(m_palette,bitmap,cliprect,data,0,0,0,x*8,y*8); + gfx->opaque(bitmap,cliprect,data,0,0,0,x*8,y*8); } } diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 26df4f83486..ac1dfb6ce00 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -486,7 +486,7 @@ void bnstars_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co pri_mask = 0xfe; gfx->set_source_clip(tx, xsize, ty, ysize); - gfx->prio_zoom_transpen(m_palette,bitmap,cliprect, + gfx->prio_zoom_transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 3adc7998c53..6ad36a8363a 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -181,7 +181,7 @@ void boxer_state::draw_boxer( bitmap_ind16 &bitmap, const rectangle &cliprect ) code = p[32 * l + 4 * i + j]; - m_gfxdecode->gfx(n)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(n)->transpen(bitmap,cliprect, code, 0, code & 0x80, 0, @@ -191,7 +191,7 @@ void boxer_state::draw_boxer( bitmap_ind16 &bitmap, const rectangle &cliprect ) code = p[32 * r + 4 * i - j + 3]; - m_gfxdecode->gfx(n)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(n)->transpen(bitmap,cliprect, code, 0, !(code & 0x80), 0, @@ -216,7 +216,7 @@ UINT32 boxer_state::screen_update_boxer(screen_device &screen, bitmap_ind16 &bit UINT8 code = m_tile_ram[32 * i + j]; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, 0, code & 0x40, code & 0x40, diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c index 939860962ad..0a604631588 100644 --- a/src/mame/drivers/buster.c +++ b/src/mame/drivers/buster.c @@ -51,7 +51,7 @@ UINT32 buster_state::screen_update_buster(screen_device &screen, bitmap_ind16 &b { int tile = (m_vram[count+1])|(m_vram[count]<<8); //int colour = tile>>12; - gfx->opaque(m_palette,bitmap,cliprect,tile,0,0,0,x*8,y*4); + gfx->opaque(bitmap,cliprect,tile,0,0,0,x*8,y*4); count+=2; } diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index c1eacea04d5..b4013900f48 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -197,12 +197,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(m_palette,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(m_palette,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/cardline.c b/src/mame/drivers/cardline.c index 390c41ddc0b..f64f5ca7308 100644 --- a/src/mame/drivers/cardline.c +++ b/src/mame/drivers/cardline.c @@ -52,7 +52,7 @@ public: -#define DRAW_TILE(machine, offset, transparency) m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,\ +#define DRAW_TILE(machine, offset, transparency) m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,\ (m_videoram[index+offset] | (m_colorram[index+offset]<<8))&0x3fff,\ (m_colorram[index+offset]&0x80)>>7,\ 0,0,\ diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index d776f2964f9..caa69b91674 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -265,7 +265,7 @@ UINT32 carrera_state::screen_update_carrera(screen_device &screen, bitmap_ind16 { int tile = m_tileram[count&0x7ff] | m_tileram[(count&0x7ff)+0x800]<<8; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,tile,0,0,0,x*8,y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,tile,0,0,0,x*8,y*8); count++; } } diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index dd7d87b95b8..e67cfd0f698 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -363,7 +363,7 @@ UINT32 cb2001_state::screen_update_cb2001(screen_device &screen, bitmap_rgb32 &b tile += m_videobank*0x2000; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,tile,colour,0,0,x*8,y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,tile,colour,0,0,x*8,y*8); count++; } @@ -429,7 +429,7 @@ UINT32 cb2001_state::screen_update_cb2001(screen_device &screen, bitmap_rgb32 &b tile += 0x1000; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,tile,colour,0,0,x*8,y*8,0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,tile,colour,0,0,x*8,y*8,0); count++; } } diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index a6b3e5643cf..c94235b1364 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -80,7 +80,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(m_palette,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 ede14bbde60..1def5112668 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -193,18 +193,18 @@ void chanbara_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre { if (!flipy) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy-16, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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(m_palette,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/chinsan.c b/src/mame/drivers/chinsan.c index f183f0d0228..203e8db7b03 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -118,7 +118,7 @@ UINT32 chinsan_state::screen_update_chinsan(screen_device &screen, bitmap_ind16 int tileno, colour; tileno = m_video[count] | (m_video[count + 0x800] << 8); colour = m_video[count + 0x1000] >> 3; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,tileno,colour,0,0,x*8,y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,tileno,colour,0,0,x*8,y*8); count++; } } diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c index 0ac3cbb6544..55542e10908 100644 --- a/src/mame/drivers/chsuper.c +++ b/src/mame/drivers/chsuper.c @@ -72,7 +72,7 @@ UINT32 chsuper_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap { int tile = ((m_vram[count+1]<<8) | m_vram[count]) & 0xffff; - gfx->opaque(m_palette,bitmap,cliprect,tile,0,0,0,x*4,y*8); + gfx->opaque(bitmap,cliprect,tile,0,0,0,x*4,y*8); count+=2; } } diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index e62fd4dd0dc..8a2573f64ac 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -99,7 +99,7 @@ UINT32 cmmb_state::screen_update_cmmb(screen_device &screen, bitmap_ind16 &bitma { int tile = videoram[count] & 0x3f; int colour = (videoram[count] & 0xc0)>>6; - gfx->opaque(m_palette,bitmap,cliprect,tile,colour,0,0,x*8,y*8); + gfx->opaque(bitmap,cliprect,tile,colour,0,0,x*8,y*8); count++; } diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 787422e4a63..cb3824b6a20 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -219,17 +219,17 @@ void cntsteer_state::zerotrgt_draw_sprites( bitmap_ind16 &bitmap, const rectangl { if (fy) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, code, color, fx, fy, sx, sy, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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(m_palette,bitmap,cliprect, code, color, fx, fy, sx, sy - 16, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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(m_palette,bitmap,cliprect, code, color, fx, fy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx, fy, sx, sy, 0); } } @@ -276,17 +276,17 @@ void cntsteer_state::cntsteer_draw_sprites( bitmap_ind16 &bitmap, const rectangl { if (fy) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, code, color, fx, fy, sx, sy, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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(m_palette,bitmap,cliprect, code, color, fx, fy, sx, sy - 16, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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(m_palette,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/coinmvga.c b/src/mame/drivers/coinmvga.c index 90b2c9f25e9..8e7d1da87df 100644 --- a/src/mame/drivers/coinmvga.c +++ b/src/mame/drivers/coinmvga.c @@ -271,7 +271,7 @@ UINT32 coinmvga_state::screen_update_coinmvga(screen_device &screen, bitmap_ind1 { int tile = m_vram[count]; //int colour = tile>>12; - gfx->opaque(m_palette,bitmap,cliprect,tile,0,0,0,x*8,y*8); + gfx->opaque(bitmap,cliprect,tile,0,0,0,x*8,y*8); count++; } diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 510dd0bb00d..29e996fb127 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -184,10 +184,10 @@ void cshooter_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec tile_low += (tile_low > 0x9) ? 0x37 : 0x30; tile_high += (tile_high > 0x9) ? 0x37 : 0x30; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, tile_high << 1, m_spriteram[i+1], 0, 0, m_spriteram[i+3],m_spriteram[i+2],0); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, tile_high << 1, m_spriteram[i+1], 0, 0, m_spriteram[i+3]+8,m_spriteram[i+2],0); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, tile_low << 1, m_spriteram[i+1], 0, 0, m_spriteram[i+3]+8,m_spriteram[i+2]+8,0); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, tile_low << 1, m_spriteram[i+1], 0, 0, m_spriteram[i+3],m_spriteram[i+2]+8,0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile_high << 1, m_spriteram[i+1], 0, 0, m_spriteram[i+3],m_spriteram[i+2],0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile_high << 1, m_spriteram[i+1], 0, 0, m_spriteram[i+3]+8,m_spriteram[i+2],0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile_low << 1, m_spriteram[i+1], 0, 0, m_spriteram[i+3]+8,m_spriteram[i+2]+8,0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile_low << 1, m_spriteram[i+1], 0, 0, m_spriteram[i+3],m_spriteram[i+2]+8,0); } } diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index f0ff65fa8db..f21ddc14623 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -311,7 +311,7 @@ static void draw_road(screen_device &screen, bitmap_ind16 &bitmap, const rectang // seems to be priority related, cases seen are 0xc0 and 0x00 (once the palette bits are masked out) if ((param2&0x80) == pri) { - gfx->transpen(state->m_palette,bitmap,cliprect,param1,col,0,0,-param3+screen_shift,i/4,0); + gfx->transpen(bitmap,cliprect,param1,col,0,0,-param3+screen_shift,i/4,0); } diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c index 76abb3b6d86..0c92816ac16 100644 --- a/src/mame/drivers/cyclemb.c +++ b/src/mame/drivers/cyclemb.c @@ -190,15 +190,15 @@ void cyclemb_state::cyclemb_draw_tilemap(screen_device &screen, bitmap_ind16 &bi if(flip_screen()) { - gfx->opaque(m_palette,bitmap,cliprect,tile,color,1,1,512-(x*8)-scrollx,256-(y*8)); + gfx->opaque(bitmap,cliprect,tile,color,1,1,512-(x*8)-scrollx,256-(y*8)); /* wrap-around */ - gfx->opaque(m_palette,bitmap,cliprect,tile,color,1,1,512-(x*8)-scrollx+512,256-(y*8)); + gfx->opaque(bitmap,cliprect,tile,color,1,1,512-(x*8)-scrollx+512,256-(y*8)); } else { - gfx->opaque(m_palette,bitmap,cliprect,tile,color,0,0,(x*8)-scrollx,(y*8)); + gfx->opaque(bitmap,cliprect,tile,color,0,0,(x*8)-scrollx,(y*8)); /* wrap-around */ - gfx->opaque(m_palette,bitmap,cliprect,tile,color,0,0,(x*8)-scrollx+512,(y*8)); + gfx->opaque(bitmap,cliprect,tile,color,0,0,(x*8)-scrollx+512,(y*8)); } count++; @@ -259,7 +259,7 @@ void cyclemb_state::cyclemb_draw_sprites(screen_device &screen, bitmap_ind16 &bi fx = !fx; fy = !fy; } - m_gfxdecode->gfx(region)->transpen(m_palette,bitmap,cliprect,spr_offs,col,fx,fy,x,y,0); + m_gfxdecode->gfx(region)->transpen(bitmap,cliprect,spr_offs,col,fx,fy,x,y,0); } } @@ -297,9 +297,9 @@ void cyclemb_state::skydest_draw_tilemap(screen_device &screen, bitmap_ind16 &bi scrolly = m_vram[(x-32)*64+1]; - gfx->opaque(m_palette,bitmap,cliprect,tile,color,0,0,x*8+scrollx,((y*8)-scrolly)&0xff); - gfx->opaque(m_palette,bitmap,cliprect,tile,color,0,0,x*8+scrollx-480,((y*8)-scrolly)&0xff); - gfx->opaque(m_palette,bitmap,cliprect,tile,color,0,0,x*8+scrollx+480,((y*8)-scrolly)&0xff); + gfx->opaque(bitmap,cliprect,tile,color,0,0,x*8+scrollx,((y*8)-scrolly)&0xff); + gfx->opaque(bitmap,cliprect,tile,color,0,0,x*8+scrollx-480,((y*8)-scrolly)&0xff); + gfx->opaque(bitmap,cliprect,tile,color,0,0,x*8+scrollx+480,((y*8)-scrolly)&0xff); } @@ -355,7 +355,7 @@ void cyclemb_state::skydest_draw_sprites(screen_device &screen, bitmap_ind16 &bi fx = !fx; fy = !fy; } - m_gfxdecode->gfx(region)->transpen(m_palette,bitmap,cliprect,spr_offs,col,fx,fy,x,y,0); + m_gfxdecode->gfx(region)->transpen(bitmap,cliprect,spr_offs,col,fx,fy,x,y,0); } } diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index 91603a103a5..49732083287 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -153,7 +153,7 @@ void dacholer_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, 0, flipx,flipy, diff --git a/src/mame/drivers/dblcrown.c b/src/mame/drivers/dblcrown.c index 947dd07739d..2343dd93ed8 100644 --- a/src/mame/drivers/dblcrown.c +++ b/src/mame/drivers/dblcrown.c @@ -125,7 +125,7 @@ UINT32 dblcrown_state::screen_update( screen_device &screen, bitmap_ind16 &bitma UINT16 tile = ((m_vram[count])|(m_vram[count+1]<<8)) & 0xfff; UINT8 col = (m_vram[count+1] >> 4); - gfx_2->opaque(m_palette,bitmap,cliprect,tile,col,0,0,x*16,y*16); + gfx_2->opaque(bitmap,cliprect,tile,col,0,0,x*16,y*16); count+=2; } @@ -140,7 +140,7 @@ UINT32 dblcrown_state::screen_update( screen_device &screen, bitmap_ind16 &bitma UINT16 tile = ((m_vram[count])|(m_vram[count+1]<<8)) & 0xfff; UINT8 col = (m_vram[count+1] >> 4); // ok? - gfx->transpen(m_palette,bitmap,cliprect,tile,col,0,0,x*8,y*8,0); + gfx->transpen(bitmap,cliprect,tile,col,0,0,x*8,y*8,0); count+=2; } diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 72897973a19..33eca144b7f 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -410,7 +410,7 @@ UINT32 ddayjlc_state::screen_update_ddayjlc(screen_device &screen, bitmap_ind16 code = (code & 0x7f) | ((flags & 0x30) << 3); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, code, color, xflip, yflip, x, y, 0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, xflip, yflip, x, y, 0); } { @@ -421,9 +421,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(m_palette,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(m_palette,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/ddealer.c b/src/mame/drivers/ddealer.c index f7a1d108543..72529699f56 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -225,7 +225,7 @@ void ddealer_state::ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UI UINT16 tile = (src[count] & 0x0fff); UINT16 colr = (src[count] & 0xf000) >> 12; count++; - gfx->transpen(m_palette,bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15); + gfx->transpen(bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15); } } count = 0; @@ -238,7 +238,7 @@ void ddealer_state::ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UI UINT16 tile = (src[count] & 0x0fff); UINT16 colr = (src[count] & 0xf000) >> 12; count++; - gfx->transpen(m_palette,bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15); + gfx->transpen(bitmap,cliprect, tile, colr, 0, flipy, (x * 16) - sx, (y * 16) - sy, 15); } } } @@ -257,7 +257,7 @@ void ddealer_state::ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UI UINT16 tile = (src[count] & 0x0fff); UINT16 colr = (src[count] & 0xf000) >> 12; count++; - gfx->transpen(m_palette,bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15); + gfx->transpen(bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15); } } count = 0; @@ -270,7 +270,7 @@ void ddealer_state::ddealer_draw_video_layer( UINT16* vreg_base, UINT16* top, UI UINT16 tile = (src[count] & 0x0fff); UINT16 colr = (src[count] & 0xf000) >> 12; count++; - gfx->transpen(m_palette,bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15); + gfx->transpen(bitmap,cliprect, tile, colr, flipy, flipy, (x * 16) + sx, (y * 16) + sy, 15); } } } diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c index 060cd697674..e788ff13c10 100644 --- a/src/mame/drivers/deco_ld.c +++ b/src/mame/drivers/deco_ld.c @@ -185,7 +185,7 @@ void deco_ld_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect fx = (spriteram[i+0] & 0x04) ? 1 : 0; fy = (spriteram[i+0] & 0x02) ? 1 : 0; - gfx->transpen(m_palette,bitmap,cliprect,spr_offs,col,fx,fy,x,y,0); + gfx->transpen(bitmap,cliprect,spr_offs,col,fx,fy,x,y,0); } for(i=0x3e0;i<0x400;i+=4) @@ -200,7 +200,7 @@ void deco_ld_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect fx = (spriteram[i+0] & 0x04) ? 1 : 0; fy = (spriteram[i+0] & 0x02) ? 1 : 0; - gfx->transpen(m_palette,bitmap,cliprect,spr_offs,col,fx,fy,x,y,0); + gfx->transpen(bitmap,cliprect,spr_offs,col,fx,fy,x,y,0); } } @@ -222,7 +222,7 @@ UINT32 deco_ld_state::screen_update_rblaster(screen_device &screen, bitmap_rgb32 int tile = m_vram0[x+y*32] | ((attr & 3) << 8); int colour = (6 & 0x7); /* TODO */ - gfx->transpen(m_palette,bitmap,cliprect,tile|0x400,colour,0,0,x*8,y*8,0); + gfx->transpen(bitmap,cliprect,tile|0x400,colour,0,0,x*8,y*8,0); } } @@ -234,7 +234,7 @@ UINT32 deco_ld_state::screen_update_rblaster(screen_device &screen, bitmap_rgb32 int tile = m_vram1[x+y*32] | ((attr & 3) << 8); int colour = (6 & 0x7); /* TODO */ - gfx->transpen(m_palette,bitmap,cliprect,tile,colour,0,0,x*8,y*8,0); + gfx->transpen(bitmap,cliprect,tile,colour,0,0,x*8,y*8,0); } } diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 57cc9f173f7..465431a3416 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -102,7 +102,7 @@ UINT32 destroyr_state::screen_update_destroyr(screen_device &screen, bitmap_ind1 continue; } - m_gfxdecode->gfx(2)->transpen(m_palette,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 */ @@ -112,7 +112,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(m_palette,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); } } @@ -123,13 +123,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(m_palette,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(m_palette,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 eb3f428ccfc..69311f96b0e 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -145,7 +145,7 @@ void discoboy_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipscreen,0, @@ -202,7 +202,7 @@ UINT32 discoboy_state::screen_update_discoboy(screen_device &screen, bitmap_ind1 tileno = 0x2000 + (tileno & 0x1fff) + 0x0000; } - m_gfxdecode->gfx(1)->opaque(m_palette,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/diverboy.c b/src/mame/drivers/diverboy.c index 6e144582354..cf83617fe3f 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -113,7 +113,7 @@ void diverboy_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipr if (!flash || (m_screen->frame_number() & 1)) { - m_gfxdecode->gfx(bank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, number, colr, 0,0, diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index b81cd0cbd4f..115b8a3df54 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -258,7 +258,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(m_palette,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/dmndrby.c b/src/mame/drivers/dmndrby.c index 997abec8677..1f17cdf799d 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -384,13 +384,13 @@ can we draw it with the tilemap? maybe not, the layout is a litle strange int chr = m_racetrack_tilemap_rom[off]; int col = m_racetrack_tilemap_rom[off+0x2000]&0x1f; int flipx = m_racetrack_tilemap_rom[off+0x2000]&0x40; - track->opaque(m_palette,bitmap,cliprect,chr,col,flipx,0,y*16+scrolly,x*16); + track->opaque(bitmap,cliprect,chr,col,flipx,0,y*16+scrolly,x*16); // draw another bit of track // a rubbish way of doing it chr = m_racetrack_tilemap_rom[off-0x100]; col = m_racetrack_tilemap_rom[off+0x1f00]&0x1f; flipx = m_racetrack_tilemap_rom[off+0x1f00]&0x40; - track->opaque(m_palette,bitmap,cliprect,chr,col,flipx,0,y*16-256+scrolly,x*16); + track->opaque(bitmap,cliprect,chr,col,flipx,0,y*16-256+scrolly,x*16); off++; } } @@ -420,13 +420,13 @@ wouldnt like to say its the most effective way though... for (a=0;a<8 ;a++) { for(b=0;b<7;b++) { - sprites->transpen(m_palette,bitmap,cliprect,anim+a*8+b,col,0,0,sprx+a*8,spry+b*8,0); + sprites->transpen(bitmap,cliprect,anim+a*8+b,col,0,0,sprx+a*8,spry+b*8,0); } } // draw the horse number a=3; b=3; - sprites->transpen(m_palette,bitmap,cliprect,anim+horse,col,0,0,sprx+a*8,spry+b*8,0); + sprites->transpen(bitmap,cliprect,anim+horse,col,0,0,sprx+a*8,spry+b*8,0); } @@ -443,7 +443,7 @@ wouldnt like to say its the most effective way though... tileno|=(bank<<8); color=((m_dderby_vidattribs[count])&0x1f); - gfx->transpen(m_palette,bitmap,cliprect,tileno,color,0,0,x*8,y*8,(tileno == 0x38) ? 0 : -1); + gfx->transpen(bitmap,cliprect,tileno,color,0,0,x*8,y*8,(tileno == 0x38) ? 0 : -1); count++; } diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 8888225c0c8..af471ccaba8 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -115,12 +115,12 @@ void dominob_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec code = m_spriteram[offs + 3] + ((m_spriteram[offs + 2] & 0x03) << 8) ; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, 2 * code, ((m_spriteram[offs + 2] & 0xf8) >> 3) , flip_screen_x(),flip_screen_y(), sx,sy + (flip_screen_y() ? 8 : -8),0); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, 2 * code + 1, ((m_spriteram[offs + 2] & 0xf8) >> 3) , flip_screen_x(),flip_screen_y(), @@ -140,7 +140,7 @@ UINT32 dominob_state::screen_update_dominob(screen_device &screen, bitmap_ind16 for (x = 0; x < 256 / 32; x++) { - m_gfxdecode->gfx(1)->opaque(m_palette,bitmap, + m_gfxdecode->gfx(1)->opaque(bitmap, cliprect, m_bgram[index] + 256 * (m_bgram[index + 1] & 0xf), m_bgram[index + 1] >> 4, @@ -155,7 +155,7 @@ UINT32 dominob_state::screen_update_dominob(screen_device &screen, bitmap_ind16 for (x = 0; x < 32; x++) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, m_videoram[(y * 32 + x) * 2 + 1] + (m_videoram[(y * 32 + x) * 2] & 7) * 256, (m_videoram[(y * 32 + x) * 2] >> 3), diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index ecc6f51f1e2..0f66957c59b 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -223,10 +223,10 @@ void dreamwld_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre { for (xct = 0; xct < xsize; xct++) { - gfx->transpen(m_palette,bitmap,cliprect, redirect[tileno], colour, xflip, yflip, xpos + xct * xinc, ypos + yct * yinc, 0); - gfx->transpen(m_palette,bitmap,cliprect, redirect[tileno], colour, xflip, yflip, (xpos + xct * xinc) - 0x200, ypos + yct * yinc, 0); - gfx->transpen(m_palette,bitmap,cliprect, redirect[tileno], colour, xflip, yflip, (xpos + xct * xinc) - 0x200, (ypos + yct * yinc) - 0x200, 0); - gfx->transpen(m_palette,bitmap,cliprect, redirect[tileno], colour, xflip, yflip, xpos + xct * xinc, (ypos + yct * yinc) - 0x200 , 0); + gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, xpos + xct * xinc, ypos + yct * yinc, 0); + gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, (xpos + xct * xinc) - 0x200, ypos + yct * yinc, 0); + gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, (xpos + xct * xinc) - 0x200, (ypos + yct * yinc) - 0x200, 0); + gfx->transpen(bitmap,cliprect, redirect[tileno], colour, xflip, yflip, xpos + xct * xinc, (ypos + yct * yinc) - 0x200 , 0); tileno++; } diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 1f2a6a17204..0af63b5296c 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -122,7 +122,7 @@ void drtomy_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ex = xflip ? (spr_size - 1 - x) : x; ey = yflip ? (spr_size - 1 - y) : y; - gfx->transpen(m_palette,bitmap,cliprect,number + x_offset[ex] + y_offset[ey], + gfx->transpen(bitmap,cliprect,number + x_offset[ex] + y_offset[ey], color,xflip,yflip, sx-0x09+x*8,sy+y*8,0); } diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 6c66483689c..f6a20e5734f 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -839,7 +839,7 @@ void dwarfd_state::drawCrt( bitmap_rgb32 &bitmap,const rectangle &cliprect ) else b = 1; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile + (m_bank + bank2) * 128, 0, 0, 0, diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 10337c1ea85..9ff37887e32 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -123,7 +123,7 @@ void egghunt_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect sx = 496 - sx; sy = 240 - sy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipscreen,flipscreen, diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index e3b5a4afa76..cafd6880b37 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -92,7 +92,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(m_palette,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/fcrash.c b/src/mame/drivers/fcrash.c index 7072230f2b9..27401edb11a 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -513,7 +513,7 @@ void cps_state::fcrash_render_sprites( screen_device &screen, bitmap_ind16 &bitm ypos = 256 - ypos - 16; xpos = xpos + m_sprite_x_offset + 49; - m_gfxdecode->gfx(2)->prio_transpen(m_palette,bitmap,cliprect, tileno, colour, flipx, flipy, xpos, ypos, screen.priority(), 0x02, 15); + m_gfxdecode->gfx(2)->prio_transpen(bitmap,cliprect, tileno, colour, flipx, flipy, xpos, ypos, screen.priority(), 0x02, 15); } } } diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index 16335014813..e476291c82a 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -121,7 +121,7 @@ UINT32 feversoc_state::screen_update_feversoc(screen_device &screen, bitmap_ind1 for(dx=0;dx<w;dx++) for(dy=0;dy<h;dy++) - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,spr_offs++,colour,0,0,(sx+dx*16),(sy+dy*16),0x3f); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,spr_offs++,colour,0,0,(sx+dx*16),(sy+dy*16),0x3f); } return 0; diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 79a7b9416f1..91e2872d0ed 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -253,7 +253,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(m_palette,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/flipjack.c b/src/mame/drivers/flipjack.c index bcecd270321..39037d2a6fb 100644 --- a/src/mame/drivers/flipjack.c +++ b/src/mame/drivers/flipjack.c @@ -204,7 +204,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3 int tile = m_bank << 8 | m_vram[x+y*0x100]; int color = m_cram[x+y*0x100] & 0x3f; - gfx->transpen(m_palette,bitmap,cliprect, tile, color, 0, 0, x*8, y*8, 0); + gfx->transpen(bitmap,cliprect, tile, color, 0, 0, x*8, y*8, 0); } } diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 48360a107b3..bae7da01d88 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -136,7 +136,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(m_palette,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/fortecar.c b/src/mame/drivers/fortecar.c index b334e84b08f..a272b1d1737 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -377,7 +377,7 @@ UINT32 fortecar_state::screen_update_fortecar(screen_device &screen, bitmap_ind1 if(bpp) color&=0x3; - m_gfxdecode->gfx(bpp)->opaque(m_palette,bitmap,cliprect,tile,color,0,0,x*8,y*8); + m_gfxdecode->gfx(bpp)->opaque(bitmap,cliprect,tile,color,0,0,x*8,y*8); count++; } diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 52c2369c6d9..a342168bb0f 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -195,7 +195,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(m_palette,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++; } } @@ -207,7 +207,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(m_palette,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++; } } @@ -295,7 +295,7 @@ UINT32 go2000_state::screen_update_go2000(screen_device &screen, bitmap_ind16 &b tile_flipy = !tile_flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, (tile & 0x1fff) + bank*0x4000, attr, tile_flipx, tile_flipy, diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c index 6107f1e62db..42765bfe40c 100644 --- a/src/mame/drivers/goodejan.c +++ b/src/mame/drivers/goodejan.c @@ -309,11 +309,11 @@ void goodejan_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { if (!fx) - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite++, color,fx,fy,x+ax*16,y+ay*16,15); else - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite++, color,fx,fy,x+(dx-1-ax)*16,y+ay*16,15); } diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index 263d050157f..6f837de39a7 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -112,7 +112,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(m_palette,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/gstream.c b/src/mame/drivers/gstream.c index 5541e385d52..bd3f10c93b8 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -772,7 +772,7 @@ void gstream_state::draw_bg_gstream(bitmap_rgb32 &bitmap, const rectangle &clipr if (m_gfxdecode->gfx(map+5)) drawgfx_transpen_x2222(bitmap,cliprect,m_gfxdecode->gfx(map),m_gfxdecode->gfx(map+5),code,0,0,0,(x*32)-(scrollx&0x1f)-m_xoffset,(y*32)-(scrolly&0x1f),0); else - m_gfxdecode->gfx(map)->transpen(m_palette,bitmap,cliprect,code,pal,0,0,(x*32)-(scrollx&0x1f)-m_xoffset,(y*32)-(scrolly&0x1f),0); + m_gfxdecode->gfx(map)->transpen(bitmap,cliprect,code,pal,0,0,(x*32)-(scrollx&0x1f)-m_xoffset,(y*32)-(scrolly&0x1f),0); basex++; } @@ -828,10 +828,10 @@ UINT32 gstream_state::screen_update_gstream(screen_device &screen, bitmap_rgb32 } else { - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap, cliprect, code, col, 0, 0, x - m_xoffset, y, 0); - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap, cliprect, code, col, 0, 0, x - m_xoffset, y-0x100, 0); - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap, cliprect, code, col, 0, 0, x - m_xoffset - 0x200, y, 0); - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap, cliprect, code, col, 0, 0, x - m_xoffset - 0x200, y-0x100, 0); + m_gfxdecode->gfx(3)->transpen(bitmap, cliprect, code, col, 0, 0, x - m_xoffset, y, 0); + m_gfxdecode->gfx(3)->transpen(bitmap, cliprect, code, col, 0, 0, x - m_xoffset, y-0x100, 0); + m_gfxdecode->gfx(3)->transpen(bitmap, cliprect, code, col, 0, 0, x - m_xoffset - 0x200, y, 0); + m_gfxdecode->gfx(3)->transpen(bitmap, cliprect, code, col, 0, 0, x - m_xoffset - 0x200, y-0x100, 0); } } diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c index 5007d87f091..1421aef3e75 100644 --- a/src/mame/drivers/hitpoker.c +++ b/src/mame/drivers/hitpoker.c @@ -119,7 +119,7 @@ UINT32 hitpoker_state::screen_update_hitpoker(screen_device &screen, bitmap_ind1 gfx_bpp = (m_colorram[count] & 0x80)>>7; //flag between 4 and 8 bpp color = gfx_bpp ? ((m_colorram[count] & 0x70)>>4) : (m_colorram[count] & 0xf); - m_gfxdecode->gfx(gfx_bpp)->opaque(m_palette,bitmap,cliprect,tile,color,0,0,x*8,y*8); + m_gfxdecode->gfx(gfx_bpp)->opaque(bitmap,cliprect,tile,color,0,0,x*8,y*8); count+=2; } diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index 361a7581ee8..edbc7a04c41 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -362,7 +362,7 @@ void igs017_state::draw_sprite(bitmap_ind16 &bitmap,const rectangle &cliprect, i gfx_element gfx(m_palette, m_sprites_gfx + addr, dimx, dimy, dimx, m_palette->entries(), 0x100, 32); - gfx.transpen(m_palette, bitmap,cliprect, + gfx.transpen(bitmap,cliprect, 0, color, flipx, flipy, sx, sy, 0x1f ); diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index 2109a6a25f5..63e4cc02507 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -56,7 +56,7 @@ UINT32 intrscti_state::screen_update_intrscti(screen_device &screen, bitmap_ind1 { int dat; dat = m_vram[count]; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,dat/*+0x100*/,0,0,0,x*8,y*8,0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,dat/*+0x100*/,0,0,0,x*8,y*8,0); count++; } } @@ -68,7 +68,7 @@ UINT32 intrscti_state::screen_update_intrscti(screen_device &screen, bitmap_ind1 { int dat; dat = m_vram[count]; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,dat+0x100,0,0,0,x*8,y*8,0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,dat+0x100,0,0,0,x*8,y*8,0); count++; } } diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index fdb526a9fb9..43738e648ea 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -86,7 +86,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(m_palette,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/jackpool.c b/src/mame/drivers/jackpool.c index f6766fe2333..04484b36c60 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -72,7 +72,7 @@ UINT32 jackpool_state::screen_update_jackpool(screen_device &screen, bitmap_ind1 int tile = (m_vram[count+(0x2000/2)] & 0x7fff); int attr = (m_vram[count+(0x2000/2)+0x800] & 0x1f00)>>8; - gfx->opaque(m_palette,bitmap,cliprect,tile,attr,0,0,x*8,y*8); + gfx->opaque(bitmap,cliprect,tile,attr,0,0,x*8,y*8); count++; } } @@ -89,7 +89,7 @@ UINT32 jackpool_state::screen_update_jackpool(screen_device &screen, bitmap_ind1 int attr = (m_vram[count+0x800] & 0x1f00)>>8; int t_pen = (m_vram[count+0x800] & 0x1000); - gfx->transpen(m_palette,bitmap,cliprect,tile,attr,0,0,x*8,y*8,(t_pen) ? 0 : -1); + gfx->transpen(bitmap,cliprect,tile,attr,0,0,x*8,y*8,(t_pen) ? 0 : -1); } count++; diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c index 93f1b557bc3..47be6834e07 100644 --- a/src/mame/drivers/jclub2.c +++ b/src/mame/drivers/jclub2.c @@ -226,7 +226,7 @@ void darkhors_state::draw_sprites_darkhors(bitmap_ind16 &bitmap, const rectangle sy = -sy; sy += 0xf8; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code/2, color, flipx, flipy, sx, sy, 0); } diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 639850652c4..7394f9de14b 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -545,7 +545,7 @@ UINT32 jollyjgr_state::screen_update_jollyjgr(screen_device &screen, bitmap_ind1 if (offs < 3 * 4) sy++; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code,color, flipx,flipy, sx,sy,0); diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index 79cda0299dd..24146125451 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -223,13 +223,13 @@ void kingdrby_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { for(dy=0;dy<h;dy++) for(dx=0;dx<w;dx++) - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,spr_offs++,colour,1,0,((x+16*w)-(dx+1)*16),(y+dy*16),0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,spr_offs++,colour,1,0,((x+16*w)-(dx+1)*16),(y+dy*16),0); } else { for(dy=0;dy<h;dy++) for(dx=0;dx<w;dx++) - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,spr_offs++,colour,0,0,(x+dx*16),(y+dy*16),0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,spr_offs++,colour,0,0,(x+dx*16),(y+dy*16),0); } } } diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index ec0ff0dbb55..c9dbcbe427a 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -521,7 +521,7 @@ UINT32 laserbat_state::screen_update_laserbat(screen_device &screen, bitmap_ind1 } if (m_sprite_enable) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_sprite_code, m_sprite_color, 0,0, diff --git a/src/mame/drivers/lbeach.c b/src/mame/drivers/lbeach.c index 390b1da1448..6e71c526cc6 100644 --- a/src/mame/drivers/lbeach.c +++ b/src/mame/drivers/lbeach.c @@ -153,7 +153,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_palette,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; @@ -172,7 +172,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(m_palette,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 2d300f58478..392c7e3beaa 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -123,7 +123,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(m_palette,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/looping.c b/src/mame/drivers/looping.c index 9cfd81992e2..63d106f49d0 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -312,7 +312,7 @@ void looping_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,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/luckgrln.c b/src/mame/drivers/luckgrln.c index 483e29fcc66..f8790404396 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -365,10 +365,10 @@ UINT32 luckgrln_state::screen_update_luckgrln(screen_device &screen, bitmap_ind1 if (bgenable==3) m_reel4_tilemap->draw(screen, bitmap, clip, 0, 0); } - if (tileattr&0x08) m_gfxdecode->gfx(region)->transpen(m_palette,bitmap,clip,tile,col,0,0,x*8,y*8, 0); + if (tileattr&0x08) m_gfxdecode->gfx(region)->transpen(bitmap,clip,tile,col,0,0,x*8,y*8, 0); #else // treat it as priority flag instead (looks better in non-adult title screen - needs verifying) - if (!(tileattr&0x08)) m_gfxdecode->gfx(region)->transpen(m_palette,bitmap,clip,tile,col,0,0,x*8,y*8, 0); + if (!(tileattr&0x08)) m_gfxdecode->gfx(region)->transpen(bitmap,clip,tile,col,0,0,x*8,y*8, 0); if (tileattr&0x04) { @@ -378,7 +378,7 @@ UINT32 luckgrln_state::screen_update_luckgrln(screen_device &screen, bitmap_ind1 if (bgenable==3) m_reel4_tilemap->draw(screen, bitmap, clip, 0, 0); } - if ((tileattr&0x08)) m_gfxdecode->gfx(region)->transpen(m_palette,bitmap,clip,tile,col,0,0,x*8,y*8, 0); + if ((tileattr&0x08)) m_gfxdecode->gfx(region)->transpen(bitmap,clip,tile,col,0,0,x*8,y*8, 0); #endif count++; diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index b0b32282302..fefaf8e5a6c 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -348,7 +348,7 @@ void m63_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); @@ -357,7 +357,7 @@ void m63_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) if (sx > 0xf0) { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx - 0x100, sy, 0); diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 2111e3b2973..4ae3534b1a5 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -531,14 +531,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_palette,*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_palette,*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/mastboy.c b/src/mame/drivers/mastboy.c index f1caeab46e7..94d48246991 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -531,7 +531,7 @@ UINT32 mastboy_state::screen_update_mastboy(screen_device &screen, bitmap_ind16 } - gfx->opaque(m_palette,bitmap,cliprect,tileno,attr,0,0,x*8,y*8); + gfx->opaque(bitmap,cliprect,tileno,attr,0,0,x*8,y*8); count+=4; diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index a788242d3d5..cd4f18d3f0b 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -92,14 +92,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(m_palette,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(m_palette,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 7d63f84b044..9cb74910895 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -184,7 +184,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, code, attr >> 8, attr & 1, attr & 2, diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index fa8a067f483..f6b9b707959 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -197,9 +197,9 @@ void mirax_state::draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect, if((x <= 1 || x >= 30) ^ draw_flag) { - gfx->opaque(m_palette,bitmap,cliprect,tile,color & 7,(m_flipscreen_x),(m_flipscreen_y),res_x,res_y); + gfx->opaque(bitmap,cliprect,tile,color & 7,(m_flipscreen_x),(m_flipscreen_y),res_x,res_y); /* wrap-around */ - gfx->opaque(m_palette,bitmap,cliprect,tile,color & 7,(m_flipscreen_x),(m_flipscreen_y),res_x,res_y+wrapy); + gfx->opaque(bitmap,cliprect,tile,color & 7,(m_flipscreen_x),(m_flipscreen_y),res_x,res_y+wrapy); } } } @@ -228,7 +228,7 @@ void mirax_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) y = (m_flipscreen_y) ? spriteram[count] : 0x100 - spriteram[count] - 16; x = (m_flipscreen_x) ? 240 - spriteram[count+3] : spriteram[count+3]; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect,spr_offs,color,fx,fy,x,y,0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect,spr_offs,color,fx,fy,x,y,0); } } diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index 143edb5b28b..3c2d7cb0d12 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -67,7 +67,7 @@ UINT32 missb2_state::screen_update_missb2(screen_device &screen, bitmap_rgb32 &b //popmessage("%02x",(*m_bgvram) & 0x1f); for (bg_offs = ((*m_bgvram) << 4); bg_offs < (((*m_bgvram) << 4) | 0xf); bg_offs++) { - m_gfxdecode->gfx(1)->opaque(m_bgpalette,bitmap,cliprect, + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, bg_offs, 0, 0,0, @@ -127,7 +127,7 @@ UINT32 missb2_state::screen_update_missb2(screen_device &screen, bitmap_rgb32 &b flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, 0, flipx,flipy, @@ -418,6 +418,7 @@ WRITE_LINE_MEMBER(missb2_state::irqhandler) MACHINE_START_MEMBER(missb2_state,missb2) { m_gfxdecode->gfx(1)->set_palette(m_bgpalette); + save_item(NAME(m_sound_nmi_enable)); save_item(NAME(m_pending_nmi)); save_item(NAME(m_sound_status)); diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c index dcc4440d1cc..4ab7cee4d78 100644 --- a/src/mame/drivers/monzagp.c +++ b/src/mame/drivers/monzagp.c @@ -106,7 +106,7 @@ UINT32 monzagp_state::screen_update_monzagp(screen_device &screen, bitmap_ind16 { for(x=0;x<256;x++) { - m_gfxdecode->gfx(m_bank&1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_bank&1)->transpen(bitmap,cliprect, m_vram[y*m_screenw+x], //(m_vram[y*m_screenw+x]&0x3f)+(m_bank>>1)*64, 0, diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c index 832ec875f7e..d938d800fa8 100644 --- a/src/mame/drivers/mpoker.c +++ b/src/mame/drivers/mpoker.c @@ -226,7 +226,7 @@ UINT32 mpoker_state::screen_update_mpoker(screen_device &screen, bitmap_ind16 &b { UINT16 dat = m_video[count]; UINT16 col = m_video[count+0x400] & 0x7f; - gfx->opaque(m_palette,bitmap,cliprect,dat,col,0,0,x*16,y*16); + gfx->opaque(bitmap,cliprect,dat,col,0,0,x*16,y*16); count++; } diff --git a/src/mame/drivers/mpu4dealem.c b/src/mame/drivers/mpu4dealem.c index 666b8cd0145..b1cb62afe16 100644 --- a/src/mame/drivers/mpu4dealem.c +++ b/src/mame/drivers/mpu4dealem.c @@ -126,7 +126,7 @@ UINT32 mpu4dealem_state::screen_update_dealem(screen_device &screen, bitmap_ind1 { int tile = m_dealem_videoram[count + 0x1000] | (m_dealem_videoram[count] << 8); count++; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,tile,0,0,0,x * 8,y * 8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,tile,0,0,0,x * 8,y * 8); } } diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index 517912f2af0..5602bc6c7ae 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -225,7 +225,7 @@ UINT32 murogem_state::screen_update_murogem(screen_device &screen, bitmap_ind16 int tileno = m_videoram[count]&0x3f; int attr = m_videoram[count+0x400]&0x0f; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect,tileno,attr,0,0,xx*8,yy*8,0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,tileno,attr,0,0,xx*8,yy*8,0); count++; diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c index 0a492a66915..d065f49a421 100644 --- a/src/mame/drivers/murogmbl.c +++ b/src/mame/drivers/murogmbl.c @@ -114,7 +114,7 @@ UINT32 murogmbl_state::screen_update_murogmbl(screen_device &screen, bitmap_ind1 for (x = 0; x < 32; x++) { int tile = m_video[count]; - gfx->opaque(m_palette,bitmap,cliprect, tile, 0, 0, 0, x * 8, y * 8); + gfx->opaque(bitmap,cliprect, tile, 0, 0, 0, x * 8, y * 8); count++; } diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index cfbdf080d67..0bbeb279f2f 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -437,7 +437,7 @@ void mwarr_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, con for (i = 0; i <= dy; i++) { - gfx->prio_transpen(m_palette,bitmap, + gfx->prio_transpen(bitmap, cliprect, source[2]+i, color, @@ -446,7 +446,7 @@ void mwarr_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, con screen.priority(),pri_mask,0 ); /* wrap around x */ - gfx->prio_transpen(m_palette,bitmap, + gfx->prio_transpen(bitmap, cliprect, source[2]+i, color, @@ -455,7 +455,7 @@ void mwarr_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, con screen.priority(),pri_mask,0 ); /* wrap around y */ - gfx->prio_transpen(m_palette,bitmap, + gfx->prio_transpen(bitmap, cliprect, source[2]+i, color, @@ -464,7 +464,7 @@ void mwarr_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, con screen.priority(),pri_mask,0 ); /* wrap around x & y */ - gfx->prio_transpen(m_palette,bitmap, + gfx->prio_transpen(bitmap, cliprect, source[2]+i, color, diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c index a8d1cc8f663..637e4b913ec 100644 --- a/src/mame/drivers/neoprint.c +++ b/src/mame/drivers/neoprint.c @@ -118,10 +118,10 @@ void neoprint_state::draw_layer(bitmap_ind16 &bitmap,const rectangle &cliprect,i UINT8 fx = (m_npvidram[i*2+1] & 0x0040); UINT8 fy = (m_npvidram[i*2+1] & 0x0080); - gfx->transpen(m_palette,bitmap,cliprect,dat,color,fx,fy,x*16+scrollx,y*16-scrolly,0); - gfx->transpen(m_palette,bitmap,cliprect,dat,color,fx,fy,x*16+scrollx-512,y*16-scrolly,0); - gfx->transpen(m_palette,bitmap,cliprect,dat,color,fx,fy,x*16+scrollx,y*16-scrolly-512,0); - gfx->transpen(m_palette,bitmap,cliprect,dat,color,fx,fy,x*16+scrollx-512,y*16-scrolly-512,0); + gfx->transpen(bitmap,cliprect,dat,color,fx,fy,x*16+scrollx,y*16-scrolly,0); + gfx->transpen(bitmap,cliprect,dat,color,fx,fy,x*16+scrollx-512,y*16-scrolly,0); + gfx->transpen(bitmap,cliprect,dat,color,fx,fy,x*16+scrollx,y*16-scrolly-512,0); + gfx->transpen(bitmap,cliprect,dat,color,fx,fy,x*16+scrollx-512,y*16-scrolly-512,0); i++; //i&=0x3ff; diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index 1d68af43e40..aea8a585f8b 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(m_palette,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(m_palette,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/olibochu.c b/src/mame/drivers/olibochu.c index 5a63e15207e..87e3956181d 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -201,7 +201,7 @@ void olibochu_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); @@ -227,7 +227,7 @@ void olibochu_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 7464eccc24d..95482776d78 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -275,7 +275,7 @@ void panicr_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect ) color = spriteram[offs+1] & 0x0f; sprite = spriteram[offs+0] | (*m_spritebank << 8); - m_gfxdecode->gfx(2)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transmask(bitmap,cliprect, sprite, color,flipx,flipy,x,y, m_palette->transpen_mask(*m_gfxdecode->gfx(2), color, 0)); diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c index 1ed02fd78e3..4a1740d3120 100644 --- a/src/mame/drivers/pinkiri8.c +++ b/src/mame/drivers/pinkiri8.c @@ -169,7 +169,7 @@ void pinkiri8_state::draw_background(bitmap_ind16 &bitmap, const rectangle &clip attr = m_janshi_back_vram[count + 2] ^ 0xf0; col = (attr >> 4) | 0x10; - gfx->transpen(m_palette,bitmap,cliprect, tile, col, 0, 0, x * 16, y * 8, 0); + gfx->transpen(bitmap,cliprect, tile, col, 0, 0, x * 16, y * 8, 0); count += 4; } @@ -315,7 +315,7 @@ void pinkiri8_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { for (int xx=0;xx<width;xx++) { - gfx->transpen(m_palette,bitmap,cliprect,spr_offs+count,col,0,0,(x+xx*16) -7 ,(y+yy*8)-33,0); + gfx->transpen(bitmap,cliprect,spr_offs+count,col,0,0,(x+xx*16) -7 ,(y+yy*8)-33,0); count++; } } diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c index 0d0b7d63973..c58f7606ced 100644 --- a/src/mame/drivers/poker72.c +++ b/src/mame/drivers/poker72.c @@ -64,7 +64,7 @@ UINT32 poker72_state::screen_update_poker72(screen_device &screen, bitmap_ind16 tile|= m_tile_bank << 12; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,tile,color,fx,fy,x*8,y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,tile,color,fx,fy,x*8,y*8); count+=2; } diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 3fe4383aea7..1853e608830 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -417,7 +417,7 @@ void powerbal_state::draw_sprites_powerbal(bitmap_ind16 &bitmap, const rectangle code = spriteram[offs + 2]; color = (spriteram[offs + 1] & 0xf000) >> 12; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,0, diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index 948826051e5..ca070f59a16 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -127,9 +127,9 @@ UINT32 progolf_state::screen_update_progolf(screen_device &screen, bitmap_ind16 { int tile = videoram[count]; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,tile,1,0,0,(256-x*8)+scroll,y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,tile,1,0,0,(256-x*8)+scroll,y*8); /* wrap-around */ - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,tile,1,0,0,(256-x*8)+scroll-1024,y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,tile,1,0,0,(256-x*8)+scroll-1024,y*8); count++; } diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index d9b1aaadce9..2650e233a8f 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -204,7 +204,7 @@ UINT32 pturn_state::screen_update_pturn(screen_device &screen, bitmap_ind16 &bit if(sx|sy) { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, spriteram[offs+1] & 0x3f , (spriteram[offs+2] & 0x1f), flipx, flipy, diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index 29fad80bf03..dce063bdcef 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -152,7 +152,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(m_palette,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/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index e0f4093c234..8bdecde4b01 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -167,7 +167,7 @@ void r2dx_v33_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite++, color,fx,fy,x+ax*16,y+ay*16,15); } @@ -177,7 +177,7 @@ void r2dx_v33_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite++, color,fx,fy,x+ax*16,y+(dy-ay-1)*16,15); } @@ -190,7 +190,7 @@ void r2dx_v33_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite++, color,fx,fy,x+(dx-ax-1)*16,y+ay*16,15); } @@ -200,7 +200,7 @@ void r2dx_v33_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite++, color,fx,fy,x+(dx-ax-1)*16,y+(dy-ay-1)*16,15); } diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index a2975f2c08d..ce5d117dc5c 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -312,8 +312,8 @@ void rabbit_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect if(xpos&0x800)xpos-=0x1000; - gfx->transpen(m_palette,*m_sprite_bitmap,m_sprite_clip,tileno,colr,!xflip/*wrongdecode?*/,yflip,xpos+0x20-8/*-(m_spriteregs[0]&0x00000fff)*/,ypos-24/*-((m_spriteregs[1]&0x0fff0000)>>16)*/,15); -// gfx->transpen(m_palette,bitmap,cliprect,tileno,colr,!xflip/*wrongdecode?*/,yflip,xpos+0xa0-8/*-(m_spriteregs[0]&0x00000fff)*/,ypos-24+0x80/*-((m_spriteregs[1]&0x0fff0000)>>16)*/,0); + gfx->transpen(*m_sprite_bitmap,m_sprite_clip,tileno,colr,!xflip/*wrongdecode?*/,yflip,xpos+0x20-8/*-(m_spriteregs[0]&0x00000fff)*/,ypos-24/*-((m_spriteregs[1]&0x0fff0000)>>16)*/,15); +// gfx->transpen(bitmap,cliprect,tileno,colr,!xflip/*wrongdecode?*/,yflip,xpos+0xa0-8/*-(m_spriteregs[0]&0x00000fff)*/,ypos-24+0x80/*-((m_spriteregs[1]&0x0fff0000)>>16)*/,0); source-=2; diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index b479aacba10..c26e1ecfab1 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -798,7 +798,7 @@ void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, tile_number, @@ -807,7 +807,7 @@ void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, (sx+xstep*xtiles)&ZEROTEAM_MASK_X,(sy+ystep*ytiles)&ZEROTEAM_MASK_Y,15); - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, tile_number, @@ -816,7 +816,7 @@ void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, ((sx+xstep*xtiles)&ZEROTEAM_MASK_X)-0x200,(sy+ystep*ytiles)&ZEROTEAM_MASK_Y,15); - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, tile_number, @@ -825,7 +825,7 @@ void raiden2_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, (sx+xstep*xtiles)&ZEROTEAM_MASK_X,((sy+ystep*ytiles)&ZEROTEAM_MASK_Y)-0x200,15); - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, tile_number, diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index f2938d0e0da..de2e3115e0d 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -517,7 +517,7 @@ UINT32 rbmk_state::screen_update_rbmk(screen_device &screen, bitmap_ind16 &bitma for (x=0;x<64;x++) { int tile = m_gms_vidram2[count+0x600]; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,(tile&0xfff)+((m_tilebank&0x10)>>4)*0x1000,tile>>12,0,0,x*8,y*32); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,(tile&0xfff)+((m_tilebank&0x10)>>4)*0x1000,tile>>12,0,0,x*8,y*32); count++; } } @@ -529,7 +529,7 @@ UINT32 rbmk_state::screen_update_rbmk(screen_device &screen, bitmap_ind16 &bitma for (x=0;x<64;x++) { int tile = m_gms_vidram[count]; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect,(tile&0xfff)+((m_tilebank>>1)&3)*0x1000,tile>>12,0,0,x*8,y*8,0); + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect,(tile&0xfff)+((m_tilebank>>1)&3)*0x1000,tile>>12,0,0,x*8,y*8,0); count++; } } diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c index 9353d0b6754..83d36447690 100644 --- a/src/mame/drivers/rgum.c +++ b/src/mame/drivers/rgum.c @@ -59,7 +59,7 @@ UINT32 rgum_state::screen_update_royalgum(screen_device &screen, bitmap_ind16 &b { int tile = m_vram[count] | ((m_cram[count] & 0xf) <<8); - gfx->opaque(m_palette,bitmap,cliprect,tile,0,0,0,x*8,y*8); + gfx->opaque(bitmap,cliprect,tile,0,0,0,x*8,y*8); count++; } diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index bdfb76b6d32..76fb1441f1f 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -351,7 +351,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(m_palette,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 279464123ae..66d65c88ebe 100644 --- a/src/mame/drivers/seabattl.c +++ b/src/mame/drivers/seabattl.c @@ -160,7 +160,7 @@ UINT32 seabattl_state::screen_update_seabattl(screen_device &screen, bitmap_ind1 { for ( x = 0; x < 32; x++ ) { - m_gfxdecode->gfx(2)->opaque(m_palette,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 ); } } } @@ -184,7 +184,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(m_palette,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 9416be1d6a1..259a19e836b 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -79,7 +79,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(m_palette,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/sengokmj.c b/src/mame/drivers/sengokmj.c index c8b2be49a6a..3155f3838c1 100644 --- a/src/mame/drivers/sengokmj.c +++ b/src/mame/drivers/sengokmj.c @@ -273,11 +273,11 @@ void sengokmj_state::draw_sprites(running_machine &machine, bitmap_ind16 &bitmap for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { if (!fx) - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite++, color,fx,fy,x+ax*16,y+ay*16,15); else - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite++, color,fx,fy,x+(dx-1-ax)*16,y+ay*16,15); } diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c index c62f6e0fe6c..6f2c13f7ccf 100644 --- a/src/mame/drivers/sigmab98.c +++ b/src/mame/drivers/sigmab98.c @@ -305,7 +305,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(m_palette,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/skyarmy.c b/src/mame/drivers/skyarmy.c index ac69f188b8d..c29b24848e1 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -149,7 +149,7 @@ UINT32 skyarmy_state::screen_update_skyarmy(screen_device &screen, bitmap_ind16 flipy = (spriteram[offs+1]&0x80)>>7; flipx = (spriteram[offs+1]&0x40)>>6; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, spriteram[offs+1]&0x3f, pal, flipx,flipy, diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 0d2e5852336..0aa43da19d8 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -277,7 +277,7 @@ UINT32 srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bit else yb=y+(height-yw-1)*8+global_y; - m_gfxdecode->gfx(0)->alpha(m_palette,bitmap,cliprect,tileno,global_pal,flip_x,flip_y,xb,yb,0,alpha); + m_gfxdecode->gfx(0)->alpha(bitmap,cliprect,tileno,global_pal,flip_x,flip_y,xb,yb,0,alpha); tileno++; } } diff --git a/src/mame/drivers/stuntair.c b/src/mame/drivers/stuntair.c index 6f0e3fed94c..7146805981e 100644 --- a/src/mame/drivers/stuntair.c +++ b/src/mame/drivers/stuntair.c @@ -215,7 +215,7 @@ void stuntair_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec y = 240 - y; - gfx->transpen(m_palette,bitmap,cliprect,tile,colour,flipx,flipy,x,y,0); + gfx->transpen(bitmap,cliprect,tile,colour,flipx,flipy,x,y,0); } } diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c index 628ec138ebd..d9b807cdc12 100644 --- a/src/mame/drivers/sub.c +++ b/src/mame/drivers/sub.c @@ -169,8 +169,8 @@ UINT32 sub_state::screen_update_sub(screen_device &screen, bitmap_ind16 &bitmap, tile += (m_attr[count]&0xe0)<<3; col = (m_attr[count]&0x1f); - gfx->opaque(m_palette,bitmap,cliprect,tile,col+0x40,0,0,x*8,(y*8)-y_offs); - gfx->opaque(m_palette,bitmap,cliprect,tile,col+0x40,0,0,x*8,(y*8)-y_offs+256); + gfx->opaque(bitmap,cliprect,tile,col+0x40,0,0,x*8,(y*8)-y_offs); + gfx->opaque(bitmap,cliprect,tile,col+0x40,0,0,x*8,(y*8)-y_offs+256); count++; } @@ -202,7 +202,7 @@ UINT32 sub_state::screen_update_sub(screen_device &screen, bitmap_ind16 &bitmap, if(fx) { x = 0xe0 - x; } fy = (spriteram_2[i+0] & 0x40) ? 0 : 1; - gfx_1->transpen(m_palette,bitmap,cliprect,spr_offs,col,0,fy,x,y,0); + gfx_1->transpen(bitmap,cliprect,spr_offs,col,0,fy,x,y,0); } } @@ -222,8 +222,8 @@ UINT32 sub_state::screen_update_sub(screen_device &screen, bitmap_ind16 &bitmap, if(x >= 28) { - gfx->opaque(m_palette,bitmap,cliprect,tile,col+0x40,0,0,x*8,(y*8)-y_offs); - gfx->opaque(m_palette,bitmap,cliprect,tile,col+0x40,0,0,x*8,(y*8)-y_offs+256); + gfx->opaque(bitmap,cliprect,tile,col+0x40,0,0,x*8,(y*8)-y_offs); + gfx->opaque(bitmap,cliprect,tile,col+0x40,0,0,x*8,(y*8)-y_offs+256); } count++; diff --git a/src/mame/drivers/summit.c b/src/mame/drivers/summit.c index abf053c8640..0c73d538744 100644 --- a/src/mame/drivers/summit.c +++ b/src/mame/drivers/summit.c @@ -59,7 +59,7 @@ UINT32 summit_state::screen_update_summit(screen_device &screen, bitmap_ind16 &b for (x=0;x<32;x++) { int tile = (m_vram[count] | ((m_attr[count]&1)<<8) ); - gfx->opaque(m_palette,bitmap,cliprect,tile,0,0,0,x*8,y*8); + gfx->opaque(bitmap,cliprect,tile,0,0,0,x*8,y*8); count++; } diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 2f9840abbde..a139f2045a3 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -127,7 +127,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(m_palette,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/superwng.c b/src/mame/drivers/superwng.c index f04e540b588..c5f5fd0b808 100644 --- a/src/mame/drivers/superwng.c +++ b/src/mame/drivers/superwng.c @@ -157,7 +157,7 @@ UINT32 superwng_state::screen_update_superwng(screen_device &screen, bitmap_ind1 int sy = m_colorram_bg[i]; int color = m_colorram_bg[i + 1] & 0xf; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flip, flip, diff --git a/src/mame/drivers/tasman.c b/src/mame/drivers/tasman.c index 51ea965c37f..84031fdc20c 100644 --- a/src/mame/drivers/tasman.c +++ b/src/mame/drivers/tasman.c @@ -71,7 +71,7 @@ UINT32 kongambl_state::screen_update_kongambl(screen_device &screen, bitmap_ind1 UINT32 tile = m_vram[count] & 0xffff; if(m_screen->visible_area().contains(x*8, y*8)) - gfx->opaque(m_palette,bitmap,cliprect,tile,0,0,0,x*8,y*8); + gfx->opaque(bitmap,cliprect,tile,0,0,0,x*8,y*8); count++; } @@ -86,7 +86,7 @@ UINT32 kongambl_state::screen_update_kongambl(screen_device &screen, bitmap_ind1 UINT32 tile = m_vram[count] & 0xffff; if(m_screen->visible_area().contains(x*8, y*8)) - gfx->transpen(m_palette,bitmap,cliprect,tile,0,0,0,x*8,y*8,0); + gfx->transpen(bitmap,cliprect,tile,0,0,0,x*8,y*8,0); count++; } diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c index bf76a10ab9c..846a08d559c 100644 --- a/src/mame/drivers/tmmjprd.c +++ b/src/mame/drivers/tmmjprd.c @@ -179,7 +179,7 @@ void tmmjprd_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect tileno >>=1; // 255 for 8bpp - gfx->transpen(m_palette,bitmap,cliprect,tileno,colr,!xflip,yflip,(xpos-xoffs)-8,(ypos)-8,255); + gfx->transpen(bitmap,cliprect,tileno,colr,!xflip,yflip,(xpos-xoffs)-8,(ypos)-8,255); } } diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 5efd74a76b8..569d583ddf7 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -342,7 +342,7 @@ UINT32 trvmadns_state::screen_update_trvmadns(screen_device &screen, bitmap_ind1 int flipy = attr & 2; if(!(attr & 0x20)) - gfx->opaque(m_palette,bitmap,cliprect,tile,color,flipx,flipy,(x*8),(y*8)); + gfx->opaque(bitmap,cliprect,tile,color,flipx,flipy,(x*8),(y*8)); count++; } } @@ -360,7 +360,7 @@ UINT32 trvmadns_state::screen_update_trvmadns(screen_device &screen, bitmap_ind1 int flipy = attr & 2; if(attr & 0x20) - gfx->transpen(m_palette,bitmap,cliprect,tile,color,flipx,flipy,(x*8),(y*8),1); + gfx->transpen(bitmap,cliprect,tile,color,flipx,flipy,(x*8),(y*8),1); count++; } } diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index f386a5cea19..a5117149892 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -156,7 +156,7 @@ void tugboat_state::draw_tilemap(bitmap_ind16 &bitmap,const rectangle &cliprect, transpen = 1; } - m_gfxdecode->gfx(rgn)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(rgn)->transpen(bitmap,cliprect, code, color, 0,0, diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 709b8b2ef34..676c0ddce31 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -653,7 +653,7 @@ static void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap) y = 256 - y; } - gfx->transpen(state->m_palette,bitmap,clip,code,color,fx,fy,x,y,0); + gfx->transpen(bitmap,clip,code,color,fx,fy,x,y,0); } } } @@ -714,7 +714,7 @@ static void draw_sprites_aoh(screen_device &screen, bitmap_ind16 &bitmap) y = 256 - y; } - gfx->transpen(state->m_palette,bitmap,clip,code,color,fx,fy,x,y,0); + gfx->transpen(bitmap,clip,code,color,fx,fy,x,y,0); } } } diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c index 7ef49bcfe40..6826911c973 100644 --- a/src/mame/drivers/vega.c +++ b/src/mame/drivers/vega.c @@ -533,7 +533,7 @@ static void draw_tilemap(vega_state *state, screen_device& screen, bitmap_ind16& { //for(int x=0;x<4;++x) { - state->m_gfxdecode->gfx(1)->transpen(state->m_palette,bitmap,cliprect, num, 0, 1,flip?1:0, x*4+x0-offset_x, (flip?(3-y):y)*8+y0-offset_y, 0); + state->m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, num, 0, 1,flip?1:0, x*4+x0-offset_x, (flip?(3-y):y)*8+y0-offset_y, 0); ++num; } } @@ -582,7 +582,7 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma // if(color==0) color=0xf; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, character, color, 0, 0, x*7, y*10,0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, character, color, 0, 0, x*7, y*10,0); ++idx; } @@ -603,7 +603,7 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma { //for(int x=0;x<4;++x) { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, num, 0, 1, flip?1:0, x*4+x0, (flip?(3-y):y)*8+y0, 0); + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, num, 0, 1, flip?1:0, x*4+x0, (flip?(3-y):y)*8+y0, 0); ++num; } } @@ -643,7 +643,7 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma for(int y=0;y<4;++y) { - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, strip_num, 0, !xor_line, 0, x*4+x0, y*8+y0, 0); + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, strip_num, 0, !xor_line, 0, x*4+x0, y*8+y0, 0); ++strip_num; } } diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c index 0643144e2eb..cc318016c05 100644 --- a/src/mame/drivers/vpoker.c +++ b/src/mame/drivers/vpoker.c @@ -156,7 +156,7 @@ UINT32 vpoker_state::screen_update_vpoker(screen_device &screen, bitmap_ind16 &b { int tile = videoram[count]; //int colour = tile>>12; - gfx->opaque(m_palette,bitmap,cliprect,tile,0,0,0,x*16,y*16); + gfx->opaque(bitmap,cliprect,tile,0,0,0,x*16,y*16); count++; } diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 1c87e84b11b..80fd36877c2 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -125,7 +125,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(m_palette,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/drivers/witch.c b/src/mame/drivers/witch.c index 38fe4fec153..46e73096f4b 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -784,22 +784,22 @@ void witch_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) color = flags & 0x0f; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tileno, color, flipx, flipy, sx+8*flipx,sy+8*flipy,0); - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tileno+1, color, flipx, flipy, sx+8-8*flipx,sy+8*flipy,0); - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tileno+2, color, flipx, flipy, sx+8*flipx,sy+8-8*flipy,0); - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tileno+3, color, flipx, flipy, sx+8-8*flipx,sy+8-8*flipy,0); diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 3104a57ce47..c5388771e90 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -130,9 +130,9 @@ public: void firetrk_draw_car(bitmap_ind16 &bitmap, const rectangle &cliprect, int which, int flash); void superbug_draw_car(bitmap_ind16 &bitmap, const rectangle &cliprect, int flash); void montecar_draw_car(bitmap_ind16 &bitmap, const rectangle &cliprect, int which, int is_collision_detection); - void check_collision(firetrk_state *state, int which); + void check_collision(int which); void set_service_mode(int enable); - void draw_text(palette_device &palette, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *alpha_ram, int x, int count, int height); + void draw_text(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *alpha_ram, int x, int count, int height); }; diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index d1e94798878..97263fc3958 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -64,7 +64,7 @@ public: UINT32 screen_update_psikyo4_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(psikyosh_interrupt); void hotgmck_pcm_bank_postload(); - void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32 scr, palette_device& palette); + void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32 scr); void set_hotgmck_pcm_bank( int n ); void install_hotgmck_pcm_bank(); DECLARE_WRITE_LINE_MEMBER(irqhandler); diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index 04622921bf8..bde4d7d4679 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -245,7 +245,7 @@ void _1942_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect do { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code + i,col, flip_screen(),flip_screen(), sx,sy + 16 * i * dir,15); @@ -304,7 +304,7 @@ void _1942_state::draw_sprites_p( bitmap_ind16 &bitmap, const rectangle &cliprec do { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code + i,col, flip_screen(),flip_screen(), sx,sy + 16 * i * dir,15); diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index fcb77f08bb2..da900cfd5cb 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -231,12 +231,12 @@ void _1943_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, if (priority) { if (color != 0x0a && color != 0x0b) - m_gfxdecode->gfx(3)->transpen(m_palette,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(m_palette,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/40love.c b/src/mame/video/40love.c index a3171bb0d36..b592500519e 100644 --- a/src/mame/video/40love.c +++ b/src/mame/video/40love.c @@ -290,7 +290,7 @@ void fortyl_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect if (spriteram[offs + 2] & 0xe0) color = machine().rand() & 0xf; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -318,7 +318,7 @@ void fortyl_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect if (spriteram_2[offs + 2] & 0xe0) color = machine().rand() & 0xf; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index 4ab506e55f4..9092cdc0790 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -131,7 +131,7 @@ void aeroboto_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre y = 240 - y; } - m_gfxdecode->gfx(1)->transpen(m_palette,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/aerofgt.c b/src/mame/video/aerofgt.c index 71197053b87..ff6c2b714a2 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -507,7 +507,7 @@ void aerofgt_state::aerfboo2_draw_sprites( screen_device &screen, bitmap_ind16 & else code = m_spriteram2[map_start % (m_spriteram2.bytes()/2)]; - m_gfxdecode->gfx(m_sprite_gfx + chip)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_sprite_gfx + chip)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -544,14 +544,14 @@ void aerofgt_state::pspikesb_draw_sprites( screen_device &screen, bitmap_ind16 & flipx = m_spriteram3[i + 1] & 0x0800; color = m_spriteram3[i + 1] & 0x000f; - m_gfxdecode->gfx(m_sprite_gfx)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_sprite_gfx)->transpen(bitmap,cliprect, code, color, flipx,flipy, xpos,ypos,15); /* wrap around y */ - m_gfxdecode->gfx(m_sprite_gfx)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_sprite_gfx)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -587,14 +587,14 @@ void aerofgt_state::spikes91_draw_sprites( screen_device &screen, bitmap_ind16 & realcode = (lookup[code] << 8) + lookup[0x10000 + code]; - m_gfxdecode->gfx(m_sprite_gfx)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_sprite_gfx)->transpen(bitmap,cliprect, realcode, color, flipx,flipy, xpos,ypos,15); /* wrap around y */ - m_gfxdecode->gfx(m_sprite_gfx)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_sprite_gfx)->transpen(bitmap,cliprect, realcode, color, flipx,flipy, @@ -635,7 +635,7 @@ void aerofgt_state::aerfboot_draw_sprites( screen_device &screen, bitmap_ind16 & sx = ((ox + 16 + 3) & 0x1ff) - 16; - m_gfxdecode->gfx(m_sprite_gfx + (code >= 0x1000 ? 0 : 1))->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_sprite_gfx + (code >= 0x1000 ? 0 : 1))->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -673,7 +673,7 @@ void aerofgt_state::aerfboot_draw_sprites( screen_device &screen, bitmap_ind16 & sx = ((ox + 16 + 3) & 0x1ff) - 16; - m_gfxdecode->gfx(m_sprite_gfx + (code >= 0x1000 ? 0 : 1))->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_sprite_gfx + (code >= 0x1000 ? 0 : 1))->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -746,7 +746,7 @@ UINT32 aerofgt_state::screen_update_spikes91(screen_device &screen, bitmap_ind16 { UINT16 tileno = m_tx_tilemap_ram[count] & 0x1fff; UINT16 colour = m_tx_tilemap_ram[count] & 0xe000; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tileno, colour>>13, 0,0, diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index 5cade5528b1..567b4cf6b04 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -104,7 +104,7 @@ void alpha68k_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } if (color) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tile, color, fx,fy, @@ -249,7 +249,7 @@ void alpha68k_state::draw_sprites_V( bitmap_ind16 &bitmap, const rectangle &clip } if (color) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tile, color, fx,fy, @@ -345,7 +345,7 @@ void alpha68k_state::draw_sprites_I( bitmap_ind16 &bitmap, const rectangle &clip fy = data & 0x4000; color = color_prom[tile << 1 | data >> 15]; - gfx->transpen(m_palette,bitmap,cliprect, tile, color, 0, fy, mx, my, 0); + gfx->transpen(bitmap,cliprect, tile, color, 0, fy, mx, my, 0); my = (my + 8) & 0xff; } @@ -467,7 +467,7 @@ void alpha68k_state::kyros_draw_sprites( bitmap_ind16 &bitmap, const rectangle & else jongbou_video_banking(&bank, data); - m_gfxdecode->gfx(bank)->transpen(m_palette,bitmap,cliprect, tile, color, fx, fy, mx, my, 0); + m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, tile, color, fx, fy, mx, my, 0); } } //ZT @@ -526,7 +526,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(m_palette,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/ambush.c b/src/mame/video/ambush.c index 8d9380adc25..ab1360a1bee 100644 --- a/src/mame/video/ambush.c +++ b/src/mame/video/ambush.c @@ -78,7 +78,7 @@ void ambush_state::draw_chars( bitmap_ind16 &bitmap, const rectangle &cliprect, scroll = ~scroll - 1; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, (col & 0x0f) | ((*m_colorbank & 0x03) << 4), flip_screen(), flip_screen(), @@ -145,7 +145,7 @@ UINT32 ambush_state::screen_update_ambush(screen_device &screen, bitmap_ind16 &b flipy = !flipy; } - m_gfxdecode->gfx(gfx)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx)->transpen(bitmap,cliprect, code, col | ((*m_colorbank & 0x03) << 4), flipx, flipy, sx,sy,0); diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index 3471ad66173..6c85976ade5 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -119,7 +119,7 @@ void amspdwy_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, // code + ((attr & 0x18)<<5), code + ((attr & 0x08)<<5), attr, diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index eb5ac0d525c..ebff59daa3c 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -162,7 +162,7 @@ void angelkds_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if (enable & enable_n) { - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, tile_no, @@ -173,7 +173,7 @@ void angelkds_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec /* wraparound */ if (xpos > 240) - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, tile_no, @@ -185,7 +185,7 @@ void angelkds_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if (ypos > 240) { - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, tile_no, @@ -196,7 +196,7 @@ void angelkds_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec /* wraparound */ if (xpos > 240) - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, tile_no, diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 441f3fae504..c776111e267 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -220,7 +220,7 @@ void appoooh_state::appoooh_draw_sprites( bitmap_ind16 &dest_bmp, const rectangl flipx = !flipx; } - gfx->transpen(m_palette,dest_bmp,cliprect, + gfx->transpen(dest_bmp,cliprect, code, color, flipx,flipy, @@ -251,7 +251,7 @@ void appoooh_state::robowres_draw_sprites( bitmap_ind16 &dest_bmp, const rectang flipx = !flipx; } - gfx->transpen(m_palette,dest_bmp,cliprect, + gfx->transpen(dest_bmp,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c index c8c46db0e38..a206ac3c1bc 100644 --- a/src/mame/video/aquarium.c +++ b/src/mame/video/aquarium.c @@ -42,14 +42,14 @@ void aquarium_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre for (chain_pos = chain; chain_pos >= 0; chain_pos--) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, col, flipx, flipy, curx,cury,0); /* wrap around y */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, col, flipx, flipy, diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index ffae2d31aca..7ae26b139ab 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -191,12 +191,12 @@ void arkanoid_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre code = m_spriteram[offs + 3] + ((m_spriteram[offs + 2] & 0x03) << 8) + 1024 * m_gfxbank; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, 2 * code, ((m_spriteram[offs + 2] & 0xf8) >> 3) + 32 * m_palettebank, flip_screen_x(),flip_screen_y(), sx,sy + (flip_screen_y() ? 8 : -8),0); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, 2 * code + 1, ((m_spriteram[offs + 2] & 0xf8) >> 3) + 32 * m_palettebank, flip_screen_x(),flip_screen_y(), diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index 0345938c9b5..2bf3c5feb22 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(m_palette,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(m_palette,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(m_palette,bitmap,bigfield_area, + m_gfxdecode->gfx(gfx)->transpen(bitmap,bigfield_area, charcode, 0, flipx, flipy, sx, sy, 0); } diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c index 916c9f15ba8..9515fb0a037 100644 --- a/src/mame/video/bagman.c +++ b/src/mame/video/bagman.c @@ -123,7 +123,7 @@ void bagman_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) } if (spriteram[offs + 2] && spriteram[offs + 3]) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(1)->transpen(bitmap, cliprect, (spriteram[offs] & 0x3f) + 2 * (spriteram[offs + 1] & 0x20), spriteram[offs + 1] & 0x1f, diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index d56fa996c0f..9c80ac30850 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -267,7 +267,7 @@ void baraduke_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { for (x = 0;x <= sizex;x++) { - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, sprite + gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)], color, flipx,flipy, diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index 4fb026e6e84..2067dcc7e9f 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -181,7 +181,7 @@ void battlane_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx, flipy, @@ -192,7 +192,7 @@ void battlane_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre dy = flipy ? 16 : -16; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code + 1, color, flipx, flipy, diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c index b14244f5ac3..1ca7dcb0298 100644 --- a/src/mame/video/battlera.c +++ b/src/mame/video/battlera.c @@ -272,14 +272,14 @@ void battlera_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &clip,int if (fy) { my += 16*(cgy-1); yinc = -16; } /* Swap tile order on Y flips */ for (i=0; i<cgy; i++) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,clip, + m_gfxdecode->gfx(1)->transpen(bitmap,clip, code, colour, fx,fy, mx,my,0); if (cgx) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,clip, + m_gfxdecode->gfx(1)->transpen(bitmap,clip, code2, colour, fx,fy, @@ -318,17 +318,17 @@ UINT32 battlera_state::screen_update_battlera(screen_device &screen, bitmap_ind1 /* If this tile was changed OR tilemap was changed, redraw */ if (m_vram_dirty[offs/2]) { m_vram_dirty[offs/2]=0; - m_gfxdecode->gfx(0)->opaque(m_palette,*m_tile_bitmap,m_tile_bitmap->cliprect(), + m_gfxdecode->gfx(0)->opaque(*m_tile_bitmap,m_tile_bitmap->cliprect(), code, m_HuC6270_vram[offs] >> 4, 0,0, 8*mx,8*my); - m_gfxdecode->gfx(2)->opaque(m_palette,*m_front_bitmap,m_tile_bitmap->cliprect(), + m_gfxdecode->gfx(2)->opaque(*m_front_bitmap,m_tile_bitmap->cliprect(), 0, 0, /* fill the spot with pen 256 */ 0,0, 8*mx,8*my); - m_gfxdecode->gfx(0)->transmask(m_palette,*m_front_bitmap,m_tile_bitmap->cliprect(), + m_gfxdecode->gfx(0)->transmask(*m_front_bitmap,m_tile_bitmap->cliprect(), code, m_HuC6270_vram[offs] >> 4, 0,0, diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index 72a6fbdcced..00769931847 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -81,7 +81,7 @@ void battlex_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, tile, color, flipx, flipy, sx, sy, 0); + gfx->transpen(bitmap,cliprect, tile, color, flipx, flipy, sx, sy, 0); source += 4; } diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c index dbd33865ed6..b69f8e547cf 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(m_palette,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/bigstrkb.c b/src/mame/video/bigstrkb.c index 9b9c27d7d0e..0cc987269fd 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -40,7 +40,7 @@ void bigstrkb_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipx = attr & 0x0100; col = attr & 0x000f; - gfx->transpen(m_palette,bitmap,cliprect,num,col,flipx,0,xpos,ypos,15); + gfx->transpen(bitmap,cliprect,num,col,flipx,0,xpos,ypos,15); source+=8; } } diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index 9b4b3302304..0a395608f37 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -214,7 +214,7 @@ void bionicc_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile_number, color, flipx,flipy, diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index b6468f5e910..ce871a1cbac 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(m_palette,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(m_palette,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(m_palette,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_palette,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_palette,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/blktiger.c b/src/mame/video/blktiger.c index 3bd7702ee6f..51ec0e5ea24 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -205,7 +205,7 @@ void blktiger_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipx = !flipx; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx,flip_screen(), diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index e8a7dbe4be1..2686dd7a005 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -189,7 +189,7 @@ void blmbycar_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, x = (x & 0x1ff) - 0x10; y = 0xf0 - ((y & 0xff) - (y & 0x100)); - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, code, 0x20 + (attr & 0xf), flipx, flipy, diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c index c5876c2d512..d8cbf566f04 100644 --- a/src/mame/video/bloodbro.c +++ b/src/mame/video/bloodbro.c @@ -167,7 +167,7 @@ void bloodbro_state::bloodbro_draw_sprites(screen_device &screen, bitmap_ind16 & { for (y = 0;y <= height;y++) { - m_gfxdecode->gfx(3)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->prio_transpen(bitmap,cliprect, tile_number++, color, flipx,flipy, @@ -212,7 +212,7 @@ void bloodbro_state::weststry_draw_sprites(screen_device &screen, bitmap_ind16 & /* Remap code 0x800 <-> 0x1000 */ code = (code&0x7ff) | ((code&0x800)<<1) | ((code&0x1000)>>1); - m_gfxdecode->gfx(3)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->prio_transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index 27edd22d22b..5f74234a5ba 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(m_palette,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/bogeyman.c b/src/mame/video/bogeyman.c index 48100eced1e..5476ad3aa90 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -123,7 +123,7 @@ void bogeyman_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); @@ -131,7 +131,7 @@ void bogeyman_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre if (multi) { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code + 1, color, flipx, flipy, sx, sy + (flip_screen() ? -16 : 16), 0); diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index 7316ebb66cc..b8c9bd07288 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -116,7 +116,7 @@ void bombjack_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx((m_spriteram[offs] & 0x80) ? 3 : 2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx((m_spriteram[offs] & 0x80) ? 3 : 2)->transpen(bitmap,cliprect, m_spriteram[offs] & 0x7f, m_spriteram[offs + 1] & 0x0f, flipx,flipy, diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index eaa767fc3cf..0dff21f8b6f 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -194,7 +194,7 @@ void bosco_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, if (flip) sx += 32-2; - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, (spriteram[offs] & 0xfc) >> 2, color, flipx,flipy, @@ -219,7 +219,7 @@ void bosco_state::draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect, y += 2; } - m_gfxdecode->gfx(2)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transmask(bitmap,cliprect, ((m_bosco_radarattr[offs] & 0x0e) >> 1) ^ 0x07, 0, !flip,!flip, diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index a04df7ffb2a..a9de766263b 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -196,24 +196,24 @@ void brkthru_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec if (m_spriteram[offs] & 0x10) /* double height */ { - m_gfxdecode->gfx(9)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(9)->transpen(bitmap,cliprect, code & ~1, color, m_flipscreen, m_flipscreen, sx, m_flipscreen ? sy + 16 : sy - 16,0); - m_gfxdecode->gfx(9)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(9)->transpen(bitmap,cliprect, code | 1, color, m_flipscreen, m_flipscreen, sx,sy,0); /* redraw with wraparound */ - m_gfxdecode->gfx(9)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(9)->transpen(bitmap,cliprect, code & ~1, color, m_flipscreen, m_flipscreen, sx,(m_flipscreen ? sy + 16 : sy - 16) + 256,0); - m_gfxdecode->gfx(9)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(9)->transpen(bitmap,cliprect, code | 1, color, m_flipscreen, m_flipscreen, @@ -222,14 +222,14 @@ void brkthru_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec } else { - m_gfxdecode->gfx(9)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(9)->transpen(bitmap,cliprect, code, color, m_flipscreen, m_flipscreen, sx,sy,0); /* redraw with wraparound */ - m_gfxdecode->gfx(9)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(9)->transpen(bitmap,cliprect, code, color, m_flipscreen, m_flipscreen, diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index c6c9c0a6aed..32ff1190720 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(m_palette,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 0dd44126f97..d1fccbc6448 100644 --- a/src/mame/video/btime.c +++ b/src/mame/video/btime.c @@ -307,7 +307,7 @@ void btime_state::draw_chars( bitmap_ind16 &bitmap, const rectangle &cliprect, U y = 33 - y; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flip_screen(),flip_screen(), @@ -348,7 +348,7 @@ void btime_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, y = y - sprite_y_adjust; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite_ram[offs + interleave], color, flipx,flipy, @@ -357,7 +357,7 @@ void btime_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, y = y + (flip_screen() ? -256 : 256); // Wrap around - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite_ram[offs + interleave], color, flipx,flipy, @@ -395,7 +395,7 @@ void btime_state::draw_background( bitmap_ind16 &bitmap, const rectangle &clipre y = 256 - y; } - m_gfxdecode->gfx(2)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->opaque(bitmap,cliprect, gfx[tileoffset + offs], color, flip_screen(),flip_screen(), @@ -491,7 +491,7 @@ UINT32 btime_state::screen_update_bnj(screen_device &screen, bitmap_ind16 &bitma sy = 256 - sy; } - m_gfxdecode->gfx(2)->opaque(m_palette,*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(), @@ -537,7 +537,7 @@ UINT32 btime_state::screen_update_cookrace(screen_device &screen, bitmap_ind16 & sy = 33 - sy; } - m_gfxdecode->gfx(2)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->opaque(bitmap,cliprect, m_bnj_backgroundram[offs], 0, flip_screen(), flip_screen(), diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c index 6827809c03a..44cbb0a4828 100644 --- a/src/mame/video/bublbobl.c +++ b/src/mame/video/bublbobl.c @@ -80,7 +80,7 @@ UINT32 bublbobl_state::screen_update_bublbobl(screen_device &screen, bitmap_ind1 flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c index e7bcb3f9e50..16a6a4ed07d 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_palette,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(), @@ -144,7 +144,7 @@ void buggychl_state::draw_fg( bitmap_ind16 &bitmap, const rectangle &cliprect ) if (flipy) sy = 31 - sy; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, 0, flipx,flipy, diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index ae16bbbe27b..20d72d58117 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -261,9 +261,9 @@ void bwing_state::draw_sprites( bitmap_ind16 &bmp, const rectangle &clip, UINT8 // single/double if (!(attrib & 0x10)) - gfx->transpen(m_palette,bmp,clip, code, color, fx, fy, x, y, 0); + gfx->transpen(bmp,clip, code, color, fx, fy, x, y, 0); else - gfx->zoom_transpen(m_palette,bmp,clip, code, color, fx, fy, x, y, 1<<16, 2<<16, 0); + gfx->zoom_transpen(bmp,clip, code, color, fx, fy, x, y, 1<<16, 2<<16, 0); } } diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c index 66c208b5bc6..908ccbad8b0 100644 --- a/src/mame/video/cabal.c +++ b/src/mame/video/cabal.c @@ -124,7 +124,7 @@ void cabal_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, tile_number, color, flipx,flipy, diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index f653ea86913..e8df61b1c31 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -40,7 +40,7 @@ void canyon_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect int c = m_videoram[0x3d0 + 2 * i + 0x9]; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, c >> 3, i, !(c & 0x80), 0, diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index 41cf4c2b6ff..1f0ddcce353 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -143,7 +143,7 @@ UINT32 carjmbre_state::screen_update_carjmbre(screen_device &screen, bitmap_ind1 flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,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/carpolo.c b/src/mame/video/carpolo.c index 3cc4e2832cf..5a7813e3481 100644 --- a/src/mame/video/carpolo.c +++ b/src/mame/video/carpolo.c @@ -178,7 +178,7 @@ static void draw_alpha_line(running_machine &machine, bitmap_ind16 &bitmap, cons code = state->m_alpharam[alpha_line * 32 + x] >> 2; col = state->m_alpharam[alpha_line * 32 + x] & 0x03; - state->m_gfxdecode->gfx(2)->transpen(state->m_palette,bitmap,cliprect, + state->m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code,col, 0,0, x*8,video_line*8,0); @@ -206,13 +206,13 @@ void carpolo_state::draw_sprite(bitmap_ind16 &bitmap, const rectangle &cliprect, x = 240 - x; y = 240 - y; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, remapped_code, col, 0, flipy, x, y,0); /* draw with wrap around */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, remapped_code, col, 0, flipy, (INT16)x - 256, y,0); @@ -262,14 +262,14 @@ UINT32 carpolo_state::screen_update_carpolo(screen_device &screen, bitmap_ind16 /* left goal - position determined by bit 6 of the horizontal and vertical timing PROMs */ - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->zoom_transpen(bitmap,cliprect, 0,0, 0,0, LEFT_GOAL_X,GOAL_Y, 0x20000,0x20000,0); /* right goal */ - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->zoom_transpen(bitmap,cliprect, 0,1, 1,0, RIGHT_GOAL_X,GOAL_Y, @@ -358,12 +358,12 @@ int carpolo_state::check_sprite_sprite_collision(int x1, int y1, int code1, int m_sprite_sprite_collision_bitmap1->fill(0); m_sprite_sprite_collision_bitmap2->fill(0); - m_gfxdecode->gfx(0)->opaque(m_palette,*m_sprite_sprite_collision_bitmap1,m_sprite_sprite_collision_bitmap1->cliprect(), + m_gfxdecode->gfx(0)->opaque(*m_sprite_sprite_collision_bitmap1,m_sprite_sprite_collision_bitmap1->cliprect(), code1,0, 0,flipy1, x1,y1); - m_gfxdecode->gfx(0)->opaque(m_palette,*m_sprite_sprite_collision_bitmap2,m_sprite_sprite_collision_bitmap2->cliprect(), + m_gfxdecode->gfx(0)->opaque(*m_sprite_sprite_collision_bitmap2,m_sprite_sprite_collision_bitmap2->cliprect(), code2,0, 0,flipy2, x2,y2); @@ -411,12 +411,12 @@ int carpolo_state::check_sprite_left_goal_collision(int x1, int y1, int code1, i m_sprite_goal_collision_bitmap1->fill(0); m_sprite_goal_collision_bitmap2->fill(0); - m_gfxdecode->gfx(0)->opaque(m_palette,*m_sprite_goal_collision_bitmap1,m_sprite_goal_collision_bitmap1->cliprect(), + m_gfxdecode->gfx(0)->opaque(*m_sprite_goal_collision_bitmap1,m_sprite_goal_collision_bitmap1->cliprect(), code1,0, 0,flipy1, x1,y1); - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,*m_sprite_goal_collision_bitmap2,m_sprite_goal_collision_bitmap2->cliprect(), + m_gfxdecode->gfx(1)->zoom_transpen(*m_sprite_goal_collision_bitmap2,m_sprite_goal_collision_bitmap2->cliprect(), 0,0, 0,0, x2,y2, @@ -468,12 +468,12 @@ int carpolo_state::check_sprite_right_goal_collision(int x1, int y1, int code1, m_sprite_goal_collision_bitmap1->fill(0); m_sprite_goal_collision_bitmap2->fill(0); - m_gfxdecode->gfx(0)->opaque(m_palette,*m_sprite_goal_collision_bitmap1,m_sprite_goal_collision_bitmap1->cliprect(), + m_gfxdecode->gfx(0)->opaque(*m_sprite_goal_collision_bitmap1,m_sprite_goal_collision_bitmap1->cliprect(), code1,0, 0,flipy1, x1,y1); - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,*m_sprite_goal_collision_bitmap2,m_sprite_goal_collision_bitmap2->cliprect(), + m_gfxdecode->gfx(1)->zoom_transpen(*m_sprite_goal_collision_bitmap2,m_sprite_goal_collision_bitmap2->cliprect(), 0,1, 1,0, x2,y2, @@ -513,7 +513,7 @@ int carpolo_state::check_sprite_border_collision(UINT8 x1, UINT8 y1, int code1, x1 = 240 - x1; y1 = 240 - y1; - m_gfxdecode->gfx(0)->opaque(m_palette,*m_sprite_border_collision_bitmap,m_sprite_border_collision_bitmap->cliprect(), + m_gfxdecode->gfx(0)->opaque(*m_sprite_border_collision_bitmap,m_sprite_border_collision_bitmap->cliprect(), code1,0, 0,flipy1, 0,0); diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index 2de1f4350d1..f8e3df670fb 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -153,7 +153,7 @@ void cbasebal_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipx = !flipx; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx,m_flipscreen, diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c index e2e0190f703..169d02fb973 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_palette,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/cclimber.c b/src/mame/video/cclimber.c index 2c973f51492..41d2cc3945c 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -569,7 +569,7 @@ void cclimber_state::cclimber_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); } } @@ -606,7 +606,7 @@ void cclimber_state::toprollr_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); } } @@ -643,7 +643,7 @@ void cclimber_state::swimmer_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); } } diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index 88cfaef0131..d5b1696a1c1 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(m_palette,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(m_palette,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(m_palette,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(m_palette,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/chaknpop.c b/src/mame/video/chaknpop.c index 97dfa7d09a4..d683a917599 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -199,7 +199,7 @@ void chaknpop_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile, color, flipx, flipy, diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c index df0da19171e..86808c079ff 100644 --- a/src/mame/video/champbas.c +++ b/src/mame/video/champbas.c @@ -197,7 +197,7 @@ void champbas_state::champbas_draw_sprites( bitmap_ind16 &bitmap, const rectangl int sy = 255 - m_spriteram_2[offs]; - gfx->transmask(m_palette,bitmap,cliprect, + gfx->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, @@ -205,7 +205,7 @@ void champbas_state::champbas_draw_sprites( bitmap_ind16 &bitmap, const rectangl // wraparound - gfx->transmask(m_palette,bitmap,cliprect, + gfx->transmask(bitmap,cliprect, code, color, flipx, flipy, sx + 256, sy, @@ -235,7 +235,7 @@ void champbas_state::exctsccr_draw_sprites( bitmap_ind16 &bitmap, const rectangl bank = ((obj1[offs + 1] >> 4) & 1); - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + (bank << 6), color, flipx, flipy, @@ -258,7 +258,7 @@ void champbas_state::exctsccr_draw_sprites( bitmap_ind16 &bitmap, const rectangl color = (obj1[offs + 1]) & 0x0f; - m_gfxdecode->gfx(2)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transmask(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index 54679c2c4d2..0b501653d69 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -123,19 +123,19 @@ void cheekyms_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre if (!flip) code++; - gfx->transpen(m_palette,bitmap,cliprect, code, color, 0, 0, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, 0, 0, x, y, 0); } else { if (m_spriteram[offs + 0] & 0x02) { - gfx->transpen(m_palette,bitmap,cliprect, code | 0x20, color, 0, 0, x, y, 0); - gfx->transpen(m_palette,bitmap,cliprect, code | 0x21, color, 0, 0, 0x10 + x, y, 0); + gfx->transpen(bitmap,cliprect, code | 0x20, color, 0, 0, x, y, 0); + gfx->transpen(bitmap,cliprect, code | 0x21, color, 0, 0, 0x10 + x, y, 0); } else { - gfx->transpen(m_palette,bitmap,cliprect, code | 0x20, color, 0, 0, x, y, 0); - gfx->transpen(m_palette,bitmap,cliprect, code | 0x21, color, 0, 0, x, 0x10 + y, 0); + gfx->transpen(bitmap,cliprect, code | 0x20, color, 0, 0, x, y, 0); + gfx->transpen(bitmap,cliprect, code | 0x21, color, 0, 0, x, 0x10 + y, 0); } } } diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c index c90358ac927..59e73c3fcc6 100644 --- a/src/mame/video/circus.c +++ b/src/mame/video/circus.c @@ -168,7 +168,7 @@ void circus_state::robotbwl_draw_bowling_alley( bitmap_ind16 &bitmap, const rect void circus_state::robotbwl_draw_ball( bitmap_ind16 &bitmap, const rectangle &cliprect ) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,/* Y is horizontal position */ + m_gfxdecode->gfx(1)->transpen(bitmap,/* Y is horizontal position */ cliprect, m_clown_z, 0, @@ -187,7 +187,7 @@ UINT32 circus_state::screen_update_robotbwl(screen_device &screen, bitmap_ind16 void circus_state::crash_draw_car( bitmap_ind16 &bitmap, const rectangle &cliprect ) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,/* Y is horizontal position */ + m_gfxdecode->gfx(1)->transpen(bitmap,/* Y is horizontal position */ cliprect, m_clown_z, 0, diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c index 315eb4ef2e6..92a9810747c 100644 --- a/src/mame/video/circusc.c +++ b/src/mame/video/circusc.c @@ -183,7 +183,7 @@ void circusc_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec } - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx,flipy, sx,sy, diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c index c98e244c66f..7f24b728b00 100644 --- a/src/mame/video/cischeat.c +++ b/src/mame/video/cischeat.c @@ -739,7 +739,7 @@ void cischeat_state::cischeat_draw_road(bitmap_ind16 &bitmap, const rectangle &c for (sx = -(xscroll%TILE_SIZE) ; sx <= max_x ; sx +=TILE_SIZE) { - gfx->transpen(m_palette,bitmap,rect, + gfx->transpen(bitmap,rect, curr_code++, attr, 0,0, @@ -845,7 +845,7 @@ void cischeat_state::f1gpstar_draw_road(bitmap_ind16 &bitmap, const rectangle &c /* Draw the line */ for (sx = xstart ; sx <= max_x ; sx += xdim) { - gfx->zoom_transpen(m_palette,bitmap,rect, + gfx->zoom_transpen(bitmap,rect, code++, attr >> 8, 0,0, @@ -1003,12 +1003,9 @@ if ( (m_debugsprites) && ( ((attr & 0x0300)>>8) != (m_debugsprites-1) ) ) { cont { for (x = xstart; x != xend; x += xinc) { - m_gfxdecode->gfx(3)->zoom_transtable(m_palette,bitmap,cliprect, - code++, - color, - flipx,flipy, + m_gfxdecode->gfx(3)->zoom_transtable(bitmap,cliprect,code++,color,flipx,flipy, (sx + x * xdim) / 0x10000, (sy + y * ydim) / 0x10000, - xscale, yscale, m_drawmode_table, m_palette->shadow_table()); + xscale, yscale, m_drawmode_table); } } #ifdef MAME_DEBUG @@ -1157,12 +1154,9 @@ if ( (m_debugsprites) && ( ((attr & 0x0300)>>8) != (m_debugsprites-1) ) ) { cont { for (x = xstart; x != xend; x += xinc) { - m_gfxdecode->gfx(3)->zoom_transtable(m_palette,bitmap,cliprect, - code++, - color, - flipx,flipy, + m_gfxdecode->gfx(3)->zoom_transtable(bitmap,cliprect,code++,color,flipx,flipy, (sx + x * xdim) / 0x10000, (sy + y * ydim) / 0x10000, - xscale, yscale, m_drawmode_table, m_palette->shadow_table()); + xscale, yscale, m_drawmode_table); } } #ifdef MAME_DEBUG diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index 132e18ee4d5..d3d906f8d75 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -115,7 +115,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(m_palette,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 ac9fe659290..8a8a351e8d1 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(m_palette,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 6607bf4d81f..495a82dcc0f 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_palette,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_palette,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/clshroad.c b/src/mame/video/clshroad.c index 2939d8617e2..205574b7054 100644 --- a/src/mame/video/clshroad.c +++ b/src/mame/video/clshroad.c @@ -296,7 +296,7 @@ void clshroad_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, attr & 0x0f, flipx,flipy, diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c index 8b4178afa31..91d3d7c9ffa 100644 --- a/src/mame/video/cninja.c +++ b/src/mame/video/cninja.c @@ -105,7 +105,7 @@ void cninja_state::cninjabl_draw_sprites( screen_device &screen, bitmap_ind16 &b while (multi >= 0) { - m_gfxdecode->gfx(3)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->prio_transpen(bitmap,cliprect, sprite - multi * inc, colour, fx,fy, diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index 504eedae376..7ea92abbe90 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -526,7 +526,7 @@ void combatsc_state::bootleg_draw_sprites( bitmap_ind16 &bitmap, const rectangle // if(m_vreg == 0x23 && (attributes & 0x02)) color += 1*16; // if(m_vreg == 0x66 ) color += 2*16; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, number, color, attributes & 0x10,0, /* flip */ x, y, 15 ); diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index ef6a4184b1f..dc0a0970e12 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(m_palette,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/compgolf.c b/src/mame/video/compgolf.c index dd6d5fcf443..703c0ca67ae 100644 --- a/src/mame/video/compgolf.c +++ b/src/mame/video/compgolf.c @@ -99,14 +99,14 @@ void compgolf_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre fx = m_spriteram[offs] & 4; fy = 0; /* ? */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite, color,fx,fy,x,y,0); /* Double Height */ if(m_spriteram[offs] & 0x10) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite + 1, color, fx, fy, x, y + 16, 0); } diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c index a6eb5945098..c5f86f269bb 100644 --- a/src/mame/video/cop01.c +++ b/src/mame/video/cop01.c @@ -188,7 +188,7 @@ void cop01_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect if (code & 0x80) code += (m_vreg[0] & 0x30) << 3; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/copsnrob.c b/src/mame/video/copsnrob.c index c1bc6507880..b14949bd928 100644 --- a/src/mame/video/copsnrob.c +++ b/src/mame/video/copsnrob.c @@ -21,7 +21,7 @@ UINT32 copsnrob_state::screen_update_copsnrob(screen_device &screen, bitmap_ind1 sx = 31 - (offs % 32); sy = offs / 32; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_videoram[offs] & 0x3f,0, 0,0, 8*sx,8*sy); @@ -30,25 +30,25 @@ UINT32 copsnrob_state::screen_update_copsnrob(screen_device &screen, bitmap_ind1 /* Draw the cars. Positioning was based on a screen shot */ if (m_cary[0]) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_carimage[0],0, 1,0, 0xe4,256 - m_cary[0],0); if (m_cary[1]) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_carimage[1],0, 1,0, 0xc4,256 - m_cary[1],0); if (m_cary[2]) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_carimage[2],0, 0,0, 0x24,256 - m_cary[2],0); if (m_cary[3]) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_carimage[3],0, 0,0, 0x04,256 - m_cary[3],0); @@ -77,7 +77,7 @@ UINT32 copsnrob_state::screen_update_copsnrob(screen_device &screen, bitmap_ind1 { /* We've hit a truck's back end, so draw the truck. The front end may be off the top of the screen, but we don't care. */ - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, 0,0, 0,0, 0x80,256 - (y + 31),0); @@ -89,7 +89,7 @@ UINT32 copsnrob_state::screen_update_copsnrob(screen_device &screen, bitmap_ind1 { /* We missed a truck's back end (it was off the bottom of the screen) but have hit its front end, so draw the truck. */ - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, 0,0, 0,0, 0x80,256 - y,0); diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c index ef939608a3b..6483bf43c5f 100644 --- a/src/mame/video/cosmic.c +++ b/src/mame/video/cosmic.c @@ -285,13 +285,13 @@ void cosmic_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect if (m_spriteram[offs] & 0x80) /* 16x16 sprite */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, 0, ~m_spriteram[offs] & 0x40, 256-m_spriteram[offs + 2],m_spriteram[offs + 1],0); else /* 32x32 sprite */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code >> 2, color, 0, ~m_spriteram[offs] & 0x40, 256-m_spriteram[offs + 2],m_spriteram[offs + 1],0); diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index 623e667d937..02f450b333b 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -2318,14 +2318,14 @@ void cps_state::cps1_render_sprites( screen_device &screen, bitmap_ind16 &bitmap #define DRAWSPRITE(CODE,COLOR,FLIPX,FLIPY,SX,SY) \ { \ if (flip_screen()) \ - m_gfxdecode->gfx(2)->prio_transpen(m_palette,bitmap,\ + m_gfxdecode->gfx(2)->prio_transpen(bitmap,\ cliprect, \ CODE, \ COLOR, \ !(FLIPX),!(FLIPY), \ 512-16-(SX),256-16-(SY), screen.priority(),0x02,15); \ else \ - m_gfxdecode->gfx(2)->prio_transpen(m_palette,bitmap,\ + m_gfxdecode->gfx(2)->prio_transpen(bitmap,\ cliprect, \ CODE, \ COLOR, \ @@ -2551,14 +2551,14 @@ void cps_state::cps2_render_sprites( screen_device &screen, bitmap_ind16 &bitmap #define DRAWSPRITE(CODE,COLOR,FLIPX,FLIPY,SX,SY) \ { \ if (flip_screen()) \ - m_gfxdecode->gfx(2)->prio_transpen(m_palette,bitmap,\ + m_gfxdecode->gfx(2)->prio_transpen(bitmap,\ cliprect, \ CODE, \ COLOR, \ !(FLIPX),!(FLIPY), \ 512-16-(SX),256-16-(SY), screen.priority(),primasks[priority],15); \ else \ - m_gfxdecode->gfx(2)->prio_transpen(m_palette,bitmap,\ + m_gfxdecode->gfx(2)->prio_transpen(bitmap,\ cliprect, \ CODE, \ COLOR, \ diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c index b3ebdae85b1..8669a033665 100644 --- a/src/mame/video/cvs.c +++ b/src/mame/video/cvs.c @@ -151,7 +151,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_palette,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); @@ -167,7 +167,7 @@ UINT32 cvs_state::screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap, collision_color = 0x102; } - m_gfxdecode->gfx(gfxnum)->opaque(m_palette,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/darius.c b/src/mame/video/darius.c index 85a0b6cc0f4..a0a9e47029b 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -74,7 +74,7 @@ void darius_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect if (curx > 900) curx -= 1024; if (cury > 400) cury -= 512; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx, flipy, curx, cury, 0); diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index b1b3fc37df9..181b1e91a24 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -173,7 +173,7 @@ UINT32 darkmist_state::screen_update_darkmist(screen_device &screen, bitmap_ind1 palette+=32; - m_gfxdecode->gfx(2)->transpen(m_palette, + m_gfxdecode->gfx(2)->transpen( bitmap,cliprect, tile, palette, diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c index f08800dab36..ef6d385c9a3 100644 --- a/src/mame/video/dcon.c +++ b/src/mame/video/dcon.c @@ -153,76 +153,76 @@ void dcon_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const for (ay=0; ay<dy; ay++) { if (!fx && !fy) { - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+ax*16,y+ay*16, screen.priority(),pri_mask,15); // wrap around y - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+ax*16,y+ay*16 + 512, screen.priority(),pri_mask,15); // wrap around y - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+ax*16,y+ay*16 - 512, screen.priority(),pri_mask,15); } else if (fx && !fy) { - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+(dx-1-ax)*16,y+ay*16, screen.priority(),pri_mask,15); // wrap around y - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+(dx-1-ax)*16,y+ay*16 + 512, screen.priority(),pri_mask,15); // wrap around y - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+(dx-1-ax)*16,y+ay*16 - 512, screen.priority(),pri_mask,15); } else if (!fx && fy) { - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+ax*16,y+(dy-1-ay)*16, screen.priority(),pri_mask,15); // wrap around y - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+ax*16,y+(dy-1-ay)*16 + 512, screen.priority(),pri_mask,15); // wrap around y - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+ax*16,y+(dy-1-ay)*16 - 512, screen.priority(),pri_mask,15); } else { - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+(dx-1-ax)*16,y+(dy-1-ay)*16, screen.priority(),pri_mask,15); // wrap around y - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+(dx-1-ax)*16,y+(dy-1-ay)*16 + 512, screen.priority(),pri_mask,15); // wrap around y - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, sprite + inc, color,fx,fy,x+(dx-1-ax)*16,y+(dy-1-ay)*16 - 512, screen.priority(),pri_mask,15); diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c index eb686ab345a..baa69b4a4e5 100644 --- a/src/mame/video/ddragon.c +++ b/src/mame/video/ddragon.c @@ -128,7 +128,7 @@ WRITE8_MEMBER(ddragon_state::ddragon_fgvideoram_w) ***************************************************************************/ -#define DRAW_SPRITE( order, sx, sy ) gfx->transpen(m_palette,bitmap,\ +#define DRAW_SPRITE( order, sx, sy ) gfx->transpen(bitmap,\ cliprect, \ (which + order),color,flipx,flipy,sx,sy,0); diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c index 5ba8b15947e..c9b0fed3ed8 100644 --- a/src/mame/video/ddragon3.c +++ b/src/mame/video/ddragon3.c @@ -216,15 +216,15 @@ void ddragon3_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec for (count=0;count<chain;count++) { if (flip_screen()) { if (!flipy) { - gfx->transpen(m_palette,bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos+(16*(chain-1))-(16*count),0); + gfx->transpen(bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos+(16*(chain-1))-(16*count),0); } else { - gfx->transpen(m_palette,bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos+16*count,0); + gfx->transpen(bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos+16*count,0); } } else { if (flipy) { - gfx->transpen(m_palette,bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos-(16*(chain-1))+(16*count),0); + gfx->transpen(bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos-(16*(chain-1))+(16*count),0); } else { - gfx->transpen(m_palette,bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos-16*count,0); + gfx->transpen(bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos-16*count,0); } } } diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c index f31ac9fd839..45968d1b30e 100644 --- a/src/mame/video/ddribble.c +++ b/src/mame/video/ddribble.c @@ -219,7 +219,7 @@ void ddribble_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipr ey = flipy ? (height - 1 - y) : y; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, (number)+x_offset[ex]+y_offset[ey], color, flipx, flipy, diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c index 4bc58c841dd..868cc79799d 100644 --- a/src/mame/video/deadang.c +++ b/src/mame/video/deadang.c @@ -116,7 +116,7 @@ void deadang_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co if (fy) fy=0; else fy=1; } - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite, color,fx,fy,x,y, screen.priority(),pri,15); diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index 15b68ee59ce..73f4a1ce85f 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -240,13 +240,13 @@ void dec8_state::srdarwin_draw_sprites( bitmap_ind16 &bitmap, const rectangle & } else sy2 = sy + 16; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx,flip_screen(), sx,sy,0); if (multi) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code+1, color, fx,flip_screen(), diff --git a/src/mame/video/deckarn.c b/src/mame/video/deckarn.c index 8e54c2f9a42..ed2b55033e6 100644 --- a/src/mame/video/deckarn.c +++ b/src/mame/video/deckarn.c @@ -99,13 +99,13 @@ void deco_karnovsprites_device::draw_sprites( running_machine &machine, bitmap_i else sprite2 = sprite + 1; - m_gfxdecode->gfx(m_gfxregion)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->transpen(bitmap,cliprect, sprite, colour,fx,fy,x,y,0); /* 1 more sprite drawn underneath */ if (extra) - m_gfxdecode->gfx(m_gfxregion)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->transpen(bitmap,cliprect, sprite2, colour,fx,fy,x,y+16,0); } diff --git a/src/mame/video/decmxc06.c b/src/mame/video/decmxc06.c index c5ab3bdcfe4..eb15a6261b1 100644 --- a/src/mame/video/decmxc06.c +++ b/src/mame/video/decmxc06.c @@ -151,7 +151,7 @@ void deco_mxc06_device::draw_sprites( running_machine &machine, bitmap_ind16 &bi if (draw) { - m_gfxdecode->gfx(m_gfxregion)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->transpen(bitmap,cliprect, code - y * incy, color & col_mask, flipx,flipy, @@ -191,7 +191,7 @@ void deco_mxc06_device::draw_sprites_bootleg( running_machine &machine, bitmap_i sx -= 0x100; - m_gfxdecode->gfx(m_gfxregion)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->transpen(bitmap,cliprect, code, color & col_mask, flipx,flipy, diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 1819cdfa58b..b07ee910556 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -484,7 +484,7 @@ void dragngun_state::dragngun_draw_sprites( bitmap_rgb32 &bitmap, const rectangl 15,zoomx,zoomy,NULL,0, ((xpos+(zoomx<<4))>>16) - (xpos>>16), ((ypos+(zoomy<<4))>>16) - (ypos>>16), alpha ); else - m_gfxdecode->gfx(bank)->alpha(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(bank)->alpha(bitmap,cliprect, sprite, colour, fx,fy, diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index 3dbd032e0b5..e01b7e99000 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -249,10 +249,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(m_palette,bitmap,cliprect, 0, color, 0, 0, sx + 64, sy, 0); - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, 1, color, 0, 0, sx, sy, 0); - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, 0, color, 0, 1, sx + 64, sy - 64, 0); - m_gfxdecode->gfx(3)->transpen(m_palette,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) @@ -516,7 +516,7 @@ void decocass_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec sy -= sprite_y_adjust; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite_ram[offs + interleave], color, flipx,flipy, @@ -525,7 +525,7 @@ void decocass_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec sy += (flip_screen() ? -256 : 256); // Wrap around - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite_ram[offs + interleave], color, flipx,flipy, diff --git a/src/mame/video/decospr.c b/src/mame/video/decospr.c index 09f865bc7a1..54805dc1cdf 100644 --- a/src/mame/video/decospr.c +++ b/src/mame/video/decospr.c @@ -356,14 +356,14 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & if ((ypos<=cliprect.max_y) && (ypos>=(cliprect.min_y)-16)) { if (m_pricallback) - m_gfxdecode->gfx(m_gfxregion)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->prio_transpen(bitmap,cliprect, sprite - multi * inc, colour, fx,fy, x,ypos, m_screen->priority(),pri,m_transpen); else - m_gfxdecode->gfx(m_gfxregion)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->transpen(bitmap,cliprect, sprite - multi * inc, colour, fx,fy, @@ -375,14 +375,14 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & if (w) { if (m_pricallback) - m_gfxdecode->gfx(m_gfxregion)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->prio_transpen(bitmap,cliprect, (sprite - multi * inc)-mult2, colour, fx,fy, x-16,ypos, m_screen->priority(),pri,m_transpen); else - m_gfxdecode->gfx(m_gfxregion)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->transpen(bitmap,cliprect, (sprite - multi * inc)-mult2, colour, fx,fy, @@ -480,7 +480,7 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & if ((ypos<=cliprect.max_y) && (ypos>=(cliprect.min_y)-16)) { - m_gfxdecode->gfx(m_gfxregion)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->prio_transpen(bitmap,cliprect, sprite + yy + h * xx, colour, fx,fy, @@ -492,7 +492,7 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & if ((ypos<=cliprect.max_y) && (ypos>=(cliprect.min_y-16))) { - m_gfxdecode->gfx(m_gfxregion)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->prio_transpen(bitmap,cliprect, sprite + yy + h * xx, colour, fx,fy, @@ -507,7 +507,7 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & if ((ypos<=cliprect.max_y) && (ypos>=(cliprect.min_y)-16)) { - m_gfxdecode->gfx(m_gfxregion)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->transpen(bitmap,cliprect, sprite + yy + h * xx, colour, fx,fy, @@ -519,7 +519,7 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & if ((ypos<=cliprect.max_y) && (ypos>=(cliprect.min_y-16))) { - m_gfxdecode->gfx(m_gfxregion)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxregion)->transpen(bitmap,cliprect, sprite + yy + h * xx, colour, fx,fy, diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c index 688e0269a8c..86e4c4a94f8 100644 --- a/src/mame/video/digdug.c +++ b/src/mame/video/digdug.c @@ -274,13 +274,13 @@ void digdug_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect for (x = 0;x <= size;x++) { UINT32 transmask = m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 0x1f); - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,visarea, + m_gfxdecode->gfx(1)->transmask(bitmap,visarea, sprite + gfx_offs[y ^ (size * flipy)][x ^ (size * flipx)], color, flipx,flipy, ((sx + 16*x) & 0xff), sy + 16*y,transmask); /* wraparound */ - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,visarea, + m_gfxdecode->gfx(1)->transmask(bitmap,visarea, sprite + gfx_offs[y ^ (size * flipy)][x ^ (size * flipx)], color, flipx,flipy, diff --git a/src/mame/video/djmain.c b/src/mame/video/djmain.c index bb63bf9a0c5..c66efa257e1 100644 --- a/src/mame/video/djmain.c +++ b/src/mame/video/djmain.c @@ -94,7 +94,7 @@ void djmain_state::draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect int zh = oy + (((y + 1) * yscale + (1 << 11)) >> 12) - sy; - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap, cliprect, c, color, @@ -112,7 +112,7 @@ void djmain_state::draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect int sy = oy + (y << 4); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, c, color, diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index bf6fd3445c7..5c050f37d40 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -630,11 +630,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(m_palette,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(m_palette,bitmap,cliprect, code, color, flipx, flipy, m_flip ? x + 256 : x - 256, y, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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++; } @@ -993,7 +993,7 @@ UINT32 dkong_state::screen_update_pestplce(screen_device &screen, bitmap_ind16 & { if (m_sprite_ram[offs]) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_sprite_ram[offs + 2], (m_sprite_ram[offs + 1] & 0x0f) + 16 * m_palette_bank, m_sprite_ram[offs + 1] & 0x80,m_sprite_ram[offs + 1] & 0x40, diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c index 336eca8c4fc..db79f4e8f3f 100644 --- a/src/mame/video/docastle.c +++ b/src/mame/video/docastle.c @@ -181,7 +181,7 @@ void docastle_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, } /* first draw the sprite, visible */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx,flipy, @@ -190,7 +190,7 @@ void docastle_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, 0x00,0x80ff); /* then draw the mask, behind the background but obscuring following sprites */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c index f837b60b502..5fcf050b694 100644 --- a/src/mame/video/dogfgt.c +++ b/src/mame/video/dogfgt.c @@ -191,7 +191,7 @@ void dogfgt_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_spriteram[offs + 1] + ((m_spriteram[offs] & 0x30) << 4), (m_spriteram[offs] & 0x08) >> 3, flipx,flipy, diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index 61d9503e6f0..b480aecca44 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -413,7 +413,7 @@ void dooyong_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co for (y = 0; y <= height; y++) { - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + y, color, flipx, flipy, @@ -481,7 +481,7 @@ void dooyong_state::rshark_draw_sprites(screen_device &screen, bitmap_ind16 &bit for (x = 0; x <= width; x++) { int _x = sx + (16 * (flipx ? (width - x) : x)); - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c index d196b9c779b..b51772bf76f 100644 --- a/src/mame/video/drgnmst.c +++ b/src/mame/video/drgnmst.c @@ -93,7 +93,7 @@ void drgnmst_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect realy = ypos + incy * y; realnumber = number + x + y * 16; - gfx->transpen(m_palette,bitmap,cliprect, realnumber, colr, flipx, flipy, realx, realy, 15); + gfx->transpen(bitmap,cliprect, realnumber, colr, flipx, flipy, realx, realy, 15); } } source += 4; diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c index d54520939aa..49d0f83b14b 100644 --- a/src/mame/video/drmicro.c +++ b/src/mame/video/drmicro.c @@ -142,7 +142,7 @@ UINT32 drmicro_state::screen_update_drmicro(screen_device &screen, bitmap_ind16 else x = (240 - x) & 0xff; - m_gfxdecode->gfx(3-g)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3-g)->transpen(bitmap,cliprect, chr, col, fx,fy, @@ -150,7 +150,7 @@ UINT32 drmicro_state::screen_update_drmicro(screen_device &screen, bitmap_ind16 if (x > 240) { - m_gfxdecode->gfx(3-g)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3-g)->transpen(bitmap,cliprect, chr, col, fx,fy, diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index 1068639afd0..ba71a858dd8 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -154,7 +154,7 @@ void dynduke_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, if (fy) fy=0; else fy=1; } - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, sprite, color,fx,fy,x,y,15); } diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c index d8a8efda0a4..7d704e38efe 100644 --- a/src/mame/video/equites.c +++ b/src/mame/video/equites.c @@ -271,7 +271,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transmask(bitmap,cliprect, tile, color, fx, fy, diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c index fe9f4775160..7c68b9125b0 100644 --- a/src/mame/video/espial.c +++ b/src/mame/video/espial.c @@ -184,11 +184,11 @@ void espial_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect { if (m_flipscreen) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code,color, flipx,flipy, sx,sy + 16,0); - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1, color, flipx,flipy, @@ -196,11 +196,11 @@ void espial_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect } else { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code,color, flipx,flipy, sx,sy - 16,0); - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + 1,color, flipx,flipy, sx,sy,0); @@ -208,7 +208,7 @@ void espial_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect } else { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code,color, flipx,flipy, sx,sy,0); diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c index 7caa54ed0d3..8bad5ea91d1 100644 --- a/src/mame/video/exedexes.c +++ b/src/mame/video/exedexes.c @@ -194,7 +194,7 @@ void exedexes_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre sx = buffered_spriteram[offs + 3] - ((buffered_spriteram[offs + 1] & 0x80) << 1); sy = buffered_spriteram[offs + 2]; - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c index 716015d602d..6abf243f155 100644 --- a/src/mame/video/exerion.c +++ b/src/mame/video/exerion.c @@ -385,11 +385,11 @@ UINT32 exerion_state::screen_update_exerion(screen_device &screen, bitmap_ind16 else code &= ~0x10, code2 |= 0x10; - gfx->transmask(m_palette,bitmap,cliprect, code2, color, xflip, yflip, x, y + gfx->height(), + gfx->transmask(bitmap,cliprect, code2, color, xflip, yflip, x, y + gfx->height(), m_palette->transpen_mask(*gfx, color, 0x10)); } - gfx->transmask(m_palette,bitmap,cliprect, code, color, xflip, yflip, x, y, + gfx->transmask(bitmap,cliprect, code, color, xflip, yflip, x, y, m_palette->transpen_mask(*gfx, color, 0x10)); if (doubled) i += 4; @@ -403,7 +403,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(m_palette,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 f1712d501b1..42024f76438 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(m_palette,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(m_palette,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_palette,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_palette,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_palette,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 75b866bed76..3a59cfcf9da 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(m_palette,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(m_palette,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 5fa601fa72d..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(m_palette,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code & 0x3fff, color, flip_screen(), flip_screen(), diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c index 08d64c5c15a..5320805e0e4 100644 --- a/src/mame/video/f1gp.c +++ b/src/mame/video/f1gp.c @@ -294,7 +294,7 @@ void f1gp_state::f1gpb_draw_sprites( screen_device &screen,bitmap_ind16 &bitmap, gfx = 0; } - m_gfxdecode->gfx(1 + gfx)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1 + gfx)->prio_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -303,7 +303,7 @@ void f1gp_state::f1gpb_draw_sprites( screen_device &screen,bitmap_ind16 &bitmap, pri ? 0 : 0x2,15); // wrap around x - m_gfxdecode->gfx(1 + gfx)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1 + gfx)->prio_transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/fantland.c b/src/mame/video/fantland.c index f04b7f3dd40..353a9081dcb 100644 --- a/src/mame/video/fantland.c +++ b/src/mame/video/fantland.c @@ -134,7 +134,7 @@ void fantland_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect if (x >= 0x180) x -= 0x200; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, code,color, flipx,flipy, x,y,0); + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code,color, flipx,flipy, x,y,0); } } diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c index f320393341a..1836155ae7e 100644 --- a/src/mame/video/fastfred.c +++ b/src/mame/video/fastfred.c @@ -274,7 +274,7 @@ void fastfred_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,flip_screen_x() ? spritevisibleareaflipx : spritevisiblearea, + m_gfxdecode->gfx(1)->transpen(bitmap,flip_screen_x() ? spritevisibleareaflipx : spritevisiblearea, code, m_colorbank | (m_spriteram[offs + 2] & 0x07), flipx,flipy, diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index 9b5b4045feb..99555c9480a 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -174,18 +174,18 @@ UINT32 fcombat_state::screen_update_fcombat(screen_device &screen, bitmap_ind16 else code &= ~0x10, code2 |= 0x10; - gfx->transpen(m_palette,bitmap,cliprect, code2, color, xflip, yflip, x, y + gfx->height(), 0); + gfx->transpen(bitmap,cliprect, code2, color, xflip, yflip, x, y + gfx->height(), 0); } if(flags&0x10) { - gfx->transpen(m_palette,bitmap,cliprect, code2 + 16, color, xflip, yflip, x, y + gfx->height(), 0); - gfx->transpen(m_palette,bitmap,cliprect, code2 + 16 * 2, color, xflip, yflip, x, y + 2 * gfx->height(), 0); - gfx->transpen(m_palette,bitmap,cliprect, code2 + 16 * 3, color, xflip, yflip, x, y + 3 * gfx->height(), 0); + gfx->transpen(bitmap,cliprect, code2 + 16, color, xflip, yflip, x, y + gfx->height(), 0); + gfx->transpen(bitmap,cliprect, code2 + 16 * 2, color, xflip, yflip, x, y + 2 * gfx->height(), 0); + gfx->transpen(bitmap,cliprect, code2 + 16 * 3, color, xflip, yflip, x, y + 3 * gfx->height(), 0); } - gfx->transpen(m_palette,bitmap,cliprect, code, color, xflip, yflip, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, xflip, yflip, x, y, 0); if (doubled) i += 4; } @@ -198,7 +198,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(m_palette,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 cd8a8415a84..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_palette,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_palette,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_palette,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_palette,m_bgbitmap,cliprect, + m_gfxdecode->gfx(1)->zoom_opaque(m_bgbitmap,cliprect, 0, 0, 0, 0, 0, 0, diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c index 1b04c4f662a..c18546540d6 100644 --- a/src/mame/video/finalizr.c +++ b/src/mame/video/finalizr.c @@ -122,22 +122,22 @@ UINT32 finalizr_state::screen_update_finalizr(screen_device &screen, bitmap_ind1 flipy = !flipy; } - gfx1->transpen(m_palette,bitmap,cliprect, + gfx1->transpen(bitmap,cliprect, code, color, flipx,flipy, flipx?sx+16:sx,flipy?sy+16:sy,0); - gfx1->transpen(m_palette,bitmap,cliprect, + gfx1->transpen(bitmap,cliprect, code + 1, color, flipx,flipy, flipx?sx:sx+16,flipy?sy+16:sy,0); - gfx1->transpen(m_palette,bitmap,cliprect, + gfx1->transpen(bitmap,cliprect, code + 2, color, flipx,flipy, flipx?sx+16:sx,flipy?sy:sy+16,0); - gfx1->transpen(m_palette,bitmap,cliprect, + gfx1->transpen(bitmap,cliprect, code + 3, color, flipx,flipy, @@ -155,7 +155,7 @@ UINT32 finalizr_state::screen_update_finalizr(screen_device &screen, bitmap_ind1 if (size == 0x00) /* 16x16 */ { - gfx1->transpen(m_palette,bitmap,cliprect, + gfx1->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -167,12 +167,12 @@ UINT32 finalizr_state::screen_update_finalizr(screen_device &screen, bitmap_ind1 if (size == 0x04) /* 16x8 */ { - gfx2->transpen(m_palette,bitmap,cliprect, + gfx2->transpen(bitmap,cliprect, code & ~1, color, flipx,flipy, flipx?sx+8:sx,sy,0); - gfx2->transpen(m_palette,bitmap,cliprect, + gfx2->transpen(bitmap,cliprect, code | 1, color, flipx,flipy, @@ -180,12 +180,12 @@ UINT32 finalizr_state::screen_update_finalizr(screen_device &screen, bitmap_ind1 } else if (size == 0x08) /* 8x16 */ { - gfx2->transpen(m_palette,bitmap,cliprect, + gfx2->transpen(bitmap,cliprect, code & ~2, color, flipx,flipy, sx,flipy?sy+8:sy,0); - gfx2->transpen(m_palette,bitmap,cliprect, + gfx2->transpen(bitmap,cliprect, code | 2, color, flipx,flipy, @@ -193,7 +193,7 @@ UINT32 finalizr_state::screen_update_finalizr(screen_device &screen, bitmap_ind1 } else if (size == 0x0c) /* 8x8 */ { - gfx2->transpen(m_palette,bitmap,cliprect, + gfx2->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c index c43e5d6ebb4..8995e857b22 100644 --- a/src/mame/video/firetrap.c +++ b/src/mame/video/firetrap.c @@ -217,24 +217,24 @@ void firetrap_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre { if (flip_screen()) sy -= 16; - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code & ~1, color, flipx,flipy, sx,flipy ? sy : sy + 16,0); - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code | 1, color, flipx,flipy, sx,flipy ? sy + 16 : sy,0); /* redraw with wraparound */ - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code & ~1, color, flipx,flipy, sx - 256,flipy ? sy : sy + 16,0); - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code | 1, color, flipx,flipy, @@ -242,14 +242,14 @@ void firetrap_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } else { - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flipx,flipy, sx,sy,0); /* redraw with wraparound */ - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c index 9d44beb4ca7..c5e839db549 100644 --- a/src/mame/video/firetrk.c +++ b/src/mame/video/firetrk.c @@ -262,7 +262,7 @@ void firetrk_state::firetrk_draw_car(bitmap_ind16 &bitmap, const rectangle &clip y = 104; } - m_gfxdecode->gfx(gfx_bank)->transpen(m_palette,bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); + m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); } @@ -274,7 +274,7 @@ void firetrk_state::superbug_draw_car(bitmap_ind16 &bitmap, const rectangle &cli int flip_x = *m_car_rot & 0x04; int flip_y = *m_car_rot & 0x08; - m_gfxdecode->gfx(gfx_bank)->transpen(m_palette,bitmap,cliprect, code, color, flip_x, flip_y, 144, 104, 0); + m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, 144, 104, 0); } @@ -303,21 +303,21 @@ void firetrk_state::montecar_draw_car(bitmap_ind16 &bitmap, const rectangle &cli y = 104; } - m_gfxdecode->gfx(gfx_bank)->transpen(m_palette,bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); + m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); } -void firetrk_state::draw_text(palette_device &palette, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *alpha_ram, +void firetrk_state::draw_text(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *alpha_ram, int x, int count, int height) { int i; for (i = 0; i < count; i++) - m_gfxdecode->gfx(0)->opaque(palette,bitmap,cliprect, alpha_ram[i], 0, 0, 0, x, i * height); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, alpha_ram[i], 0, 0, 0, x, i * height); } -void firetrk_state::check_collision(firetrk_state *state, int which) +void firetrk_state::check_collision(int which) { int y, x; @@ -348,8 +348,8 @@ UINT32 firetrk_state::screen_update_firetrk(screen_device &screen, bitmap_ind16 m_tilemap1->draw(screen, bitmap, playfield_window, 0, 0); firetrk_draw_car(bitmap, playfield_window, 0, m_flash); firetrk_draw_car(bitmap, playfield_window, 1, m_flash); - draw_text(m_palette, bitmap, cliprect, m_alpha_num_ram + 0x00, 296, 0x10, 0x10); - draw_text(m_palette, bitmap, cliprect, m_alpha_num_ram + 0x10, 8, 0x10, 0x10); + draw_text(bitmap, cliprect, m_alpha_num_ram + 0x00, 296, 0x10, 0x10); + draw_text(bitmap, cliprect, m_alpha_num_ram + 0x10, 8, 0x10, 0x10); if (cliprect.max_y == screen.visible_area().max_y) { @@ -357,11 +357,11 @@ UINT32 firetrk_state::screen_update_firetrk(screen_device &screen, bitmap_ind16 m_helper2.fill(0xff, playfield_window); firetrk_draw_car(m_helper2, playfield_window, 0, FALSE); - check_collision(this, 0); + check_collision(0); m_helper2.fill(0xff, playfield_window); firetrk_draw_car(m_helper2, playfield_window, 1, FALSE); - check_collision(this, 1); + check_collision(1); *m_blink = FALSE; } @@ -381,8 +381,8 @@ UINT32 firetrk_state::screen_update_superbug(screen_device &screen, bitmap_ind16 bitmap.fill(0, cliprect); m_tilemap1->draw(screen, bitmap, playfield_window, 0, 0); superbug_draw_car(bitmap, playfield_window, m_flash); - draw_text(m_palette, bitmap, cliprect, m_alpha_num_ram + 0x00, 296, 0x10, 0x10); - draw_text(m_palette, bitmap, cliprect, m_alpha_num_ram + 0x10, 8, 0x10, 0x10); + draw_text(bitmap, cliprect, m_alpha_num_ram + 0x00, 296, 0x10, 0x10); + draw_text(bitmap, cliprect, m_alpha_num_ram + 0x10, 8, 0x10, 0x10); if (cliprect.max_y == screen.visible_area().max_y) { @@ -390,7 +390,7 @@ UINT32 firetrk_state::screen_update_superbug(screen_device &screen, bitmap_ind16 m_helper2.fill(0xff, playfield_window); superbug_draw_car(m_helper2, playfield_window, FALSE); - check_collision(this, 0); + check_collision(0); *m_blink = FALSE; } @@ -411,8 +411,8 @@ UINT32 firetrk_state::screen_update_montecar(screen_device &screen, bitmap_ind16 m_tilemap1->draw(screen, bitmap, playfield_window, 0, 0); montecar_draw_car(bitmap, playfield_window, 0, FALSE); montecar_draw_car(bitmap, playfield_window, 1, FALSE); - draw_text(m_palette, bitmap, cliprect, m_alpha_num_ram + 0x00, 24, 0x20, 0x08); - draw_text(m_palette, bitmap, cliprect, m_alpha_num_ram + 0x20, 16, 0x20, 0x08); + draw_text(bitmap, cliprect, m_alpha_num_ram + 0x00, 24, 0x20, 0x08); + draw_text(bitmap, cliprect, m_alpha_num_ram + 0x20, 16, 0x20, 0x08); if (cliprect.max_y == screen.visible_area().max_y) { @@ -420,11 +420,11 @@ UINT32 firetrk_state::screen_update_montecar(screen_device &screen, bitmap_ind16 m_helper2.fill(0xff, playfield_window); montecar_draw_car(m_helper2, playfield_window, 0, TRUE); - check_collision(this, 0); + check_collision(0); m_helper2.fill(0xff, playfield_window); montecar_draw_car(m_helper2, playfield_window, 1, TRUE); - check_collision(this, 1); + check_collision(1); } return 0; diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c index 0d2bc30604a..f456a76eaf9 100644 --- a/src/mame/video/fitfight.c +++ b/src/mame/video/fitfight.c @@ -34,7 +34,7 @@ void fitfight_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre if (end) break; if (prio == layer) - gfx->transpen(m_palette,bitmap,cliprect, number, colr, xflip, yflip, xpos, ypos, 0); + gfx->transpen(bitmap,cliprect, number, colr, xflip, yflip, xpos, ypos, 0); source += 4; } diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c index 93f2299a2ed..8b5e22931f5 100644 --- a/src/mame/video/flower.c +++ b/src/mame/video/flower.c @@ -82,7 +82,7 @@ void flower_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect if (xblock) sxoffs+=xblocksizeinpixels; if (yblock) syoffs+=yblocksizeinpixels; - gfx->zoom_transpen(m_palette,bitmap,cliprect, + gfx->zoom_transpen(bitmap,cliprect, code+yoffs+xoffs, color, flipx,flipy, diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c index b36e8f4bcde..9a14c68c4c6 100644 --- a/src/mame/video/flstory.c +++ b/src/mame/video/flstory.c @@ -192,14 +192,14 @@ void flstory_state::flstory_draw_sprites( bitmap_ind16 &bitmap, const rectangle else sy = 240 - sy - 1 ; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, m_spriteram[offs + 1] & 0x0f, flipx,flipy, sx,sy,15); /* wrap around */ if (sx > 240) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, m_spriteram[offs + 1] & 0x0f, flipx,flipy, @@ -249,14 +249,14 @@ void flstory_state::victnine_draw_sprites( bitmap_ind16 &bitmap, const rectangle else sy = 240 - sy + 1 ; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, m_spriteram[offs + 1] & 0x0f, flipx,flipy, sx,sy,15); /* wrap around */ if (sx > 240) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, m_spriteram[offs + 1] & 0x0f, flipx,flipy, diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c index f5d7fa8cec9..4d6b8b15c61 100644 --- a/src/mame/video/foodf.c +++ b/src/mame/video/foodf.c @@ -137,11 +137,11 @@ UINT32 foodf_state::screen_update_foodf(screen_device &screen, bitmap_ind16 &bit int vflip = (data1 >> 14) & 1; int pri = (data1 >> 13) & 1; - gfx->prio_transpen(m_palette,bitmap,cliprect, pict, color, hflip, vflip, + gfx->prio_transpen(bitmap,cliprect, pict, color, hflip, vflip, xpos, ypos, priority_bitmap, pri * 2, 0); /* draw again with wraparound (needed to get the end of level animation right) */ - gfx->prio_transpen(m_palette,bitmap,cliprect, pict, color, hflip, vflip, + gfx->prio_transpen(bitmap,cliprect, pict, color, hflip, vflip, xpos - 256, ypos, priority_bitmap, pri * 2, 0); } diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c index edd3e79fd40..497d1e3dc88 100644 --- a/src/mame/video/freekick.c +++ b/src/mame/video/freekick.c @@ -51,7 +51,7 @@ void freekick_state::gigas_draw_sprites( bitmap_ind16 &bitmap, const rectangle & flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -85,7 +85,7 @@ void freekick_state::pbillrd_draw_sprites( bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -120,7 +120,7 @@ void freekick_state::freekick_draw_sprites( bitmap_ind16 &bitmap, const rectangl flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c index 2f439c8bc30..7994550c2af 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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2 + m_gfx_bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); @@ -133,7 +133,7 @@ void funkybee_state::draw_columns( bitmap_ind16 &bitmap, const rectangle &clipre if (flip) sy = 248 - sy; - m_gfxdecode->gfx(m_gfx_bank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfx_bank)->transpen(bitmap,cliprect, code, color, flip, flip, sx, sy,0); @@ -146,7 +146,7 @@ void funkybee_state::draw_columns( bitmap_ind16 &bitmap, const rectangle &clipre if (flip) sy = 248 - sy; - m_gfxdecode->gfx(m_gfx_bank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfx_bank)->transpen(bitmap,cliprect, code, color, flip, flip, sx, sy,0); diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c index 62211336540..f1a572965aa 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(m_palette,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(m_palette,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/fuukifg2.c b/src/mame/video/fuukifg2.c index e79920c6c41..619c024c410 100644 --- a/src/mame/video/fuukifg2.c +++ b/src/mame/video/fuukifg2.c @@ -196,7 +196,7 @@ void fuuki16_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, c for (x = xstart; x != xend; x += xinc) { if (xzoom == (16*8) && yzoom == (16*8)) - gfx->prio_transpen(m_palette,bitmap,cliprect, + gfx->prio_transpen(bitmap,cliprect, code++, attr & 0x3f, flipx, flipy, @@ -204,7 +204,7 @@ void fuuki16_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, c priority_bitmap, pri_mask,15 ); else - gfx->prio_zoom_transpen(m_palette,bitmap,cliprect, + gfx->prio_zoom_transpen(bitmap,cliprect, code++, attr & 0x3f, flipx, flipy, diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c index bb316d15f4d..d6f1c7e1947 100644 --- a/src/mame/video/fuukifg3.c +++ b/src/mame/video/fuukifg3.c @@ -218,7 +218,7 @@ void fuuki32_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, c for (x = xstart; x != xend; x += xinc) { if (xzoom == (16*8) && yzoom == (16*8)) - gfx->prio_transpen(m_palette,bitmap,cliprect, + gfx->prio_transpen(bitmap,cliprect, code++, attr & 0x3f, flipx, flipy, @@ -226,7 +226,7 @@ void fuuki32_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, c priority_bitmap, pri_mask,15 ); else - gfx->prio_zoom_transpen(m_palette,bitmap,cliprect, + gfx->prio_zoom_transpen(bitmap,cliprect, code++, attr & 0x3f, flipx, flipy, diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c index 5ecfc58ea3f..d423e556009 100644 --- a/src/mame/video/gaelco.c +++ b/src/mame/video/gaelco.c @@ -166,7 +166,7 @@ void gaelco_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, co ex = xflip ? (spr_size - 1 - x) : x; ey = yflip ? (spr_size - 1 - y) : y; - gfx->prio_transpen(m_palette,bitmap,cliprect,number + x_offset[ex] + y_offset[ey], + gfx->prio_transpen(bitmap,cliprect,number + x_offset[ex] + y_offset[ey], color,xflip,yflip, sx-0x0f+x*8,sy+y*8, screen.priority(),pri_mask,0); diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index af690928c1b..9a5834ae526 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -377,7 +377,7 @@ void gaelco2_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co /* normal sprite, pen 0 transparent */ if (color_effect == 0){ - gfx->transpen(m_palette,bitmap,cliprect, number, + gfx->transpen(bitmap,cliprect, number, color, xflip, yflip, ((sx + ex*16) & 0x3ff) + spr_x_adjust, ((sy + ey*16) & 0x1ff), 0); diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index 71efb3d59a5..24faaf847ef 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -505,7 +505,7 @@ void galaga_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect { for (x = 0;x <= sizex;x++) { - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, sprite + gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)], color, flipx,flipy, diff --git a/src/mame/video/galastrm.c b/src/mame/video/galastrm.c index 822e1b14988..235b3840419 100644 --- a/src/mame/video/galastrm.c +++ b/src/mame/video/galastrm.c @@ -198,7 +198,7 @@ void galastrm_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c if ((priority != 0 && sprite_ptr->primask != 0) || (priority == 0 && sprite_ptr->primask == 0)) { - m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index 60502e1d406..78ffee37133 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -578,7 +578,7 @@ void galaxian_state::sprites_draw(bitmap_rgb32 &bitmap, const rectangle &cliprec /* draw */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,clip, + m_gfxdecode->gfx(1)->transpen(bitmap,clip, code, color, flipx, flipy, GALAXIAN_H0START + GALAXIAN_XSCALE * sx, sy, 0); diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c index 3a2e19cbd13..d1b57c12ee5 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(m_palette,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/galivan.c b/src/mame/video/galivan.c index 9ebf00ad1f7..34e3dadeaaf 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -314,7 +314,7 @@ void galivan_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec // code = buffered_spriteram[offs + 1] + ((attr & 0x02) << 7); code = buffered_spriteram[offs + 1] + ((attr & 0x06) << 7); // for ninjemak, not sure ? - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, code, color + 16 * (spritepalettebank[code >> 2] & 0x0f), flipx,flipy, diff --git a/src/mame/video/galpanic.c b/src/mame/video/galpanic.c index 6e5bda766e7..dfbda6567ee 100644 --- a/src/mame/video/galpanic.c +++ b/src/mame/video/galpanic.c @@ -72,7 +72,7 @@ void galpanic_state::comad_draw_sprites(bitmap_ind16 &bitmap, const rectangle &c sx = (sx&0x1ff) - (sx&0x200); sy = (sy&0x1ff) - (sy&0x200); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c index 6e9888a0096..78882878bcc 100644 --- a/src/mame/video/galspnbl.c +++ b/src/mame/video/galspnbl.c @@ -35,7 +35,7 @@ UINT32 galspnbl_state::screen_update_galspnbl(screen_device &screen, bitmap_ind1 draw_background(bitmap, cliprect); - galspnbl_draw_sprites(screen, m_gfxdecode, m_palette, bitmap, cliprect, 0, m_spriteram, m_spriteram.bytes()); + galspnbl_draw_sprites(screen, m_gfxdecode, bitmap, cliprect, 0, m_spriteram, m_spriteram.bytes()); for (offs = 0; offs < 0x1000 / 2; offs++) { @@ -50,7 +50,7 @@ UINT32 galspnbl_state::screen_update_galspnbl(screen_device &screen, bitmap_ind1 /* What is this? A priority/half transparency marker? */ if (!(attr & 0x0008)) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, 0,0, @@ -59,6 +59,6 @@ UINT32 galspnbl_state::screen_update_galspnbl(screen_device &screen, bitmap_ind1 } } - galspnbl_draw_sprites(screen, m_gfxdecode, m_palette, bitmap, cliprect, 1, m_spriteram, m_spriteram.bytes()); + galspnbl_draw_sprites(screen, m_gfxdecode, bitmap, cliprect, 1, m_spriteram, m_spriteram.bytes()); return 0; } diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c index 2e037febbf0..bc83b1dfa95 100644 --- a/src/mame/video/gaplus.c +++ b/src/mame/video/gaplus.c @@ -284,7 +284,7 @@ void gaplus_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect { for (x = 0;x <= sizex;x++) { - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, sprite + (duplicate ? 0 : (gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)])), color, flipx,flipy, diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index 1902095878f..a3fc70b8374 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -152,7 +152,7 @@ void gberet_state::gberet_draw_sprites( bitmap_ind16 &bitmap, const rectangle &c flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 0)); } } @@ -204,7 +204,7 @@ void gberet_state::gberetb_draw_sprites( bitmap_ind16 &bitmap, const rectangle & flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 0)); } } diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c index 61e42cee0f3..a8578c63a3e 100644 --- a/src/mame/video/gcpinbal.c +++ b/src/mame/video/gcpinbal.c @@ -199,7 +199,7 @@ void gcpinbal_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, for (chain_pos = chain; chain_pos >= 0; chain_pos--) { - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, code, col, flipx, flipy, diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index 0c6d8dfb5d7..03140207ad6 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -225,7 +225,7 @@ void ginganin_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code & 0x3fff, attr >> 12, flipx, flipy, diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c index 99bfe8fffab..a727cbd066b 100644 --- a/src/mame/video/gladiatr.c +++ b/src/mame/video/gladiatr.c @@ -225,7 +225,7 @@ void gladiatr_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec int t = tile_offset[ey][ex] + tile_number; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, t, color, xflip, yflip, diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c index 3c5c1aea574..0051d08e0d8 100644 --- a/src/mame/video/glass.c +++ b/src/mame/video/glass.c @@ -177,7 +177,7 @@ void glass_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect number = ((number & 0x03) << 14) | ((number & 0x0fffc) >> 2); - gfx->transpen(m_palette,bitmap,cliprect,number, + gfx->transpen(bitmap,cliprect,number, 0x10 + (color & 0x0f),xflip,yflip, sx-0x0f,sy,0); } diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c index 916e290fb32..b0b81f3b09e 100644 --- a/src/mame/video/gng.c +++ b/src/mame/video/gng.c @@ -122,7 +122,7 @@ void gng_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, buffered_spriteram[offs] + ((attributes << 2) & 0x300), (attributes >> 4) & 3, flipx,flipy, diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c index 7ba27b01ed0..c1353cc6216 100644 --- a/src/mame/video/goal92.c +++ b/src/mame/video/goal92.c @@ -121,7 +121,7 @@ void goal92_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect y = 256 - (y + 7); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, sprite, color,fx,fy,x,y,15); } diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c index ea9af9beaf7..89e828d1ac7 100644 --- a/src/mame/video/goindol.c +++ b/src/mame/video/goindol.c @@ -100,13 +100,13 @@ void goindol_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec palette = sprite_ram[offs + 2] >> 3; - m_gfxdecode->gfx(gfxbank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfxbank)->transpen(bitmap,cliprect, tile, palette, flip_screen(),flip_screen(), sx,sy, 0); - m_gfxdecode->gfx(gfxbank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfxbank)->transpen(bitmap,cliprect, tile+1, palette, flip_screen(),flip_screen(), diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index a9bb50139fe..ce2110cb916 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -374,7 +374,7 @@ UINT32 goldstar_state::screen_update_goldstar(screen_device &screen, bitmap_ind1 int girlyscroll = (INT8)((m_cm_girl_scroll & 0xf0)); int girlxscroll = (INT8)((m_cm_girl_scroll & 0x0f)<<4); - gfx->zoom_transpen(m_palette,bitmap,cliprect,m_cmaster_girl_num,m_cmaster_girl_pal,0,0,-(girlxscroll*2),-(girlyscroll), 0x20000, 0x10000,0); + gfx->zoom_transpen(bitmap,cliprect,m_cmaster_girl_num,m_cmaster_girl_pal,0,0,-(girlxscroll*2),-(girlyscroll), 0x20000, 0x10000,0); } } @@ -416,7 +416,7 @@ UINT32 goldstar_state::screen_update_bingowng(screen_device &screen, bitmap_ind1 int girlyscroll = (INT8)((m_cm_girl_scroll & 0xf0)); int girlxscroll = (INT8)((m_cm_girl_scroll & 0x0f)<<4); - gfx->zoom_transpen(m_palette,bitmap,cliprect,m_cmaster_girl_num,m_cmaster_girl_pal,0,0,-(girlxscroll*2),-(girlyscroll), 0x20000, 0x10000,0); + gfx->zoom_transpen(bitmap,cliprect,m_cmaster_girl_num,m_cmaster_girl_pal,0,0,-(girlxscroll*2),-(girlyscroll), 0x20000, 0x10000,0); } } diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index d1404782bea..db79cf1fb7b 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -210,7 +210,7 @@ void gottlieb_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprec if (flip_screen_y()) sy = 228 - sy; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,clip, + m_gfxdecode->gfx(2)->transpen(bitmap,clip, code, 0, flip_screen_x(), flip_screen_y(), sx,sy, 0); diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index 5feef958fdd..fe0b99f69d1 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -126,7 +126,7 @@ void gotya_state::draw_status_row( bitmap_ind16 &bitmap, const rectangle &clipre sy = 31 - row; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_videoram2[row * 32 + col], m_videoram2[row * 32 + col + 0x10] & 0x0f, flip_screen_x(), flip_screen_y(), @@ -150,7 +150,7 @@ void gotya_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect sy = 240 - sy; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flip_screen_x(), flip_screen_y(), sx, sy, 0); diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c index 736e7eb3b3b..e37adf5c4a9 100644 --- a/src/mame/video/gp9001.c +++ b/src/mame/video/gp9001.c @@ -816,7 +816,7 @@ void gp9001vdp_device::draw_sprites( running_machine &machine, bitmap_ind16 &bit else sx = sx_base + dim_x; /* - gfx->transpen(m_palette,bitmap,cliprect,sprite, + gfx->transpen(bitmap,cliprect,sprite, color, flipx,flipy, sx,sy,0); diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index 5ef4d5daf27..3c5b87f7f06 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -122,7 +122,7 @@ int grchamp_state::collision_check(grchamp_state *state, bitmap_ind16 &bitmap, i { /* draw the current player sprite into a work bitmap */ - m_gfxdecode->gfx(4)->opaque(m_palette,m_work_bitmap, + m_gfxdecode->gfx(4)->opaque(m_work_bitmap, m_work_bitmap.cliprect(), m_cpu0_out[4]&0xf, 1, /* color */ @@ -188,7 +188,7 @@ void grchamp_state::draw_sprites(grchamp_state *state, bitmap_ind16 &bitmap, con int color = source[2]; int code = source[1); - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, bank + (code & 0x3f), color, code & 0x40, diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c index 1959dee20b2..9a827ddf34e 100644 --- a/src/mame/video/groundfx.c +++ b/src/mame/video/groundfx.c @@ -179,7 +179,7 @@ void groundfx_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co else clipper=&cliprect; - m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(m_palette,bitmap,*clipper, + m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(bitmap,*clipper, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c index 1344dc08904..3853d0566d8 100644 --- a/src/mame/video/gsword.c +++ b/src/mame/video/gsword.c @@ -185,7 +185,7 @@ void gsword_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) flipx = !flipx; flipy = !flipy; } - m_gfxdecode->gfx(1+spritebank)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1+spritebank)->transmask(bitmap,cliprect, tile, color, flipx,flipy, diff --git a/src/mame/video/gunbustr.c b/src/mame/video/gunbustr.c index 762b7158fca..a0aebbf25a3 100644 --- a/src/mame/video/gunbustr.c +++ b/src/mame/video/gunbustr.c @@ -164,7 +164,7 @@ void gunbustr_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co } else { - m_gfxdecode->gfx(sprite_ptr->gfx)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_ptr->gfx)->zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, @@ -183,7 +183,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); { sprite_ptr--; - m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index 897726f6848..81c8dc5040e 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -159,7 +159,7 @@ void gunsmoke_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(m_palette,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/gyruss.c b/src/mame/video/gyruss.c index a6d27895e06..3b5a0c9aff6 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -139,7 +139,7 @@ void gyruss_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(gfx_bank)->transpen(m_palette,bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); + m_gfxdecode->gfx(gfx_bank)->transpen(bitmap,cliprect, code, color, flip_x, flip_y, x, y, 0); } } diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c index 017597947e0..acf13a7646a 100644 --- a/src/mame/video/higemaru.c +++ b/src/mame/video/higemaru.c @@ -122,14 +122,14 @@ void higemaru_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, col, flipx,flipy, sx,sy,15); /* draw again with wraparound */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, col, flipx,flipy, diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c index 8f227bf3608..14f8591e405 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(m_palette,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(m_palette,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/hng64.c b/src/mame/video/hng64.c index be90650f35d..5a419e39975 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -253,8 +253,8 @@ static void draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, const rect if (!chaini) { - if (!blend) gfx->prio_zoom_transpen(state->m_palette,bitmap,cliprect,tileno,pal,xflip,yflip,drawx,drawy,zoomx,zoomy/*0x10000*/,screen.priority(), 0,0); - else gfx->prio_zoom_transpen_additive(state->m_palette,bitmap,cliprect,tileno,pal,xflip,yflip,drawx,drawy,zoomx,zoomy/*0x10000*/,screen.priority(), 0,0); + if (!blend) gfx->prio_zoom_transpen(bitmap,cliprect,tileno,pal,xflip,yflip,drawx,drawy,zoomx,zoomy/*0x10000*/,screen.priority(), 0,0); + else gfx->prio_zoom_transpen_additive(bitmap,cliprect,tileno,pal,xflip,yflip,drawx,drawy,zoomx,zoomy/*0x10000*/,screen.priority(), 0,0); tileno++; } else // inline chain mode, used by ss64 @@ -273,8 +273,8 @@ static void draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, const rect pal&=0xf; } - if (!blend) gfx->prio_zoom_transpen(state->m_palette,bitmap,cliprect,tileno,pal,xflip,yflip,drawx,drawy,zoomx,zoomy/*0x10000*/,screen.priority(), 0,0); - else gfx->prio_zoom_transpen_additive(state->m_palette,bitmap,cliprect,tileno,pal,xflip,yflip,drawx,drawy,zoomx,zoomy/*0x10000*/,screen.priority(), 0,0); + if (!blend) gfx->prio_zoom_transpen(bitmap,cliprect,tileno,pal,xflip,yflip,drawx,drawy,zoomx,zoomy/*0x10000*/,screen.priority(), 0,0); + else gfx->prio_zoom_transpen_additive(bitmap,cliprect,tileno,pal,xflip,yflip,drawx,drawy,zoomx,zoomy/*0x10000*/,screen.priority(), 0,0); source +=8; } diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c index 67bee594774..2c8bd92ff5c 100644 --- a/src/mame/video/holeland.c +++ b/src/mame/video/holeland.c @@ -133,7 +133,7 @@ void holeland_state::holeland_draw_sprites( bitmap_ind16 &bitmap, const rectangl sy = 240 - sy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -171,7 +171,7 @@ void holeland_state::crzrally_draw_sprites( bitmap_ind16 &bitmap,const rectangle sy = 240 - sy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index 647bf65a00d..1c51463ed44 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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, sx,sy,0); // wraparound - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index b2c0cc316d6..4531164fa19 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -149,7 +149,7 @@ void hyperspt_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre sy += 1; - m_gfxdecode->gfx(0)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, @@ -158,7 +158,7 @@ void hyperspt_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre /* redraw with wraparound */ - m_gfxdecode->gfx(0)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx - 256, sy, diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index 8bfe72e0ffa..7f4a06efe64 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -549,7 +549,7 @@ void hyprduel_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, gfx_element gfx(m_palette, base_gfx8 + gfxstart, width, height, width, m_palette->entries(), 0, 256); - gfx.prio_zoom_transpen(m_palette, bitmap,cliprect, + gfx.prio_zoom_transpen(bitmap,cliprect, 0, color_start >> 4, flipx, flipy, @@ -565,7 +565,7 @@ void hyprduel_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, gfx_element gfx(m_palette, base_gfx4 + 2 * gfxstart, width, height, width, m_palette->entries(), 0, 16); - gfx.prio_zoom_transpen(m_palette, bitmap,cliprect, + gfx.prio_zoom_transpen(bitmap,cliprect, 0, color + color_start, flipx, flipy, diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c index b21adf0d0f4..222be4eb5e2 100644 --- a/src/mame/video/ikki.c +++ b/src/mame/video/ikki.c @@ -88,7 +88,7 @@ void ikki_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) if (y > 240) y = y - 256; - m_gfxdecode->gfx(1)->transmask(m_palette,m_sprite_bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(m_sprite_bitmap,cliprect, code, color, m_flipscreen,m_flipscreen, x,y, @@ -171,7 +171,7 @@ UINT32 ikki_state::screen_update_ikki(screen_device &screen, bitmap_ind16 &bitma bank = (color & 0xe0) << 3; color = ((color & 0x1f)<<0) | ((color & 0x80) >> 2); - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_videoram[offs * 2 + 1] + bank, color, m_flipscreen,m_flipscreen, @@ -206,7 +206,7 @@ UINT32 ikki_state::screen_update_ikki(screen_device &screen, bitmap_ind16 &bitma bank = (color & 0xe0) << 3; color = ((color & 0x1f)<<0) | ((color & 0x80) >> 2); - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_videoram[offs * 2 + 1] + bank, color, m_flipscreen,m_flipscreen, diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c index 7a646cef6ea..f68234f6768 100644 --- a/src/mame/video/irobot.c +++ b/src/mame/video/irobot.c @@ -360,7 +360,7 @@ UINT32 irobot_state::screen_update_irobot(screen_device &screen, bitmap_ind16 &b int code = videoram[offs] & 0x3f; int color = ((videoram[offs] & 0xc0) >> 6) | (m_alphamap >> 3); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, 0,0, 8*x,8*y,0); diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index 22bf3afcafa..402576d0c4d 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -178,7 +178,7 @@ void ironhors_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre switch (sr[offs + 4] & 0x0c) { case 0x00: /* 16x16 */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code/4, color, flipx,flipy, @@ -189,12 +189,12 @@ void ironhors_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre { if (flip_screen()) sy += 8; // this fixes the train wheels' position - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code & ~1, color, flipx,flipy, flipx?sx+8:sx,sy,0); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code | 1, color, flipx,flipy, @@ -204,12 +204,12 @@ void ironhors_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre case 0x08: /* 8x16 */ { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code & ~2, color, flipx,flipy, sx,flipy?sy+8:sy,0); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code | 2, color, flipx,flipy, @@ -219,7 +219,7 @@ void ironhors_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre case 0x0c: /* 8x8 */ { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -287,7 +287,7 @@ void ironhors_state::farwest_draw_sprites( bitmap_ind16 &bitmap, const rectangle switch (sr[offs + 3] & 0x0c) { case 0x00: /* 16x16 */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code/4, color, flipx,flipy, @@ -298,12 +298,12 @@ void ironhors_state::farwest_draw_sprites( bitmap_ind16 &bitmap, const rectangle { if (flip_screen()) sy += 8; // this fixes the train wheels' position - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code & ~1, color, flipx,flipy, flipx?sx+8:sx,sy,0); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code | 1, color, flipx,flipy, @@ -313,12 +313,12 @@ void ironhors_state::farwest_draw_sprites( bitmap_ind16 &bitmap, const rectangle case 0x08: /* 8x16 */ { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code & ~2, color, flipx,flipy, sx,flipy?sy+8:sy,0); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code | 2, color, flipx,flipy, @@ -328,7 +328,7 @@ void ironhors_state::farwest_draw_sprites( bitmap_ind16 &bitmap, const rectangle case 0x0c: /* 8x8 */ { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c index 35d31c52ef2..0f5a6713df4 100644 --- a/src/mame/video/jack.c +++ b/src/mame/video/jack.c @@ -89,7 +89,7 @@ void jack_state::jack_draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipr flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -209,7 +209,7 @@ void jack_state::joinem_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cli flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c index 5f2f033581d..83c2788dd41 100644 --- a/src/mame/video/jackal.c +++ b/src/mame/video/jackal.c @@ -109,7 +109,7 @@ void jackal_state::draw_background( screen_device &screen, bitmap_ind16 &bitmap, m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); } -#define DRAW_SPRITE(bank, code, sx, sy) m_gfxdecode->gfx(bank)->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); +#define DRAW_SPRITE(bank, code, sx, sy) m_gfxdecode->gfx(bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); void jackal_state::draw_sprites_region( bitmap_ind16 &bitmap, const rectangle &cliprect, const UINT8 *sram, int length, int bank ) { diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c index a60038e9230..80b78a3e16d 100644 --- a/src/mame/video/jailbrek.c +++ b/src/mame/video/jailbrek.c @@ -82,7 +82,7 @@ void jailbrek_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, code, color, flipx, flipy, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 0)); } diff --git a/src/mame/video/jalblend.c b/src/mame/video/jalblend.c index 4f78ca974df..54591f9e2b5 100644 --- a/src/mame/video/jalblend.c +++ b/src/mame/video/jalblend.c @@ -91,7 +91,7 @@ void jal_blend_drawgfx_common(palette_device &palette,_BitmapClass &dest_bmp,con { if (jal_blend_table == NULL) { - gfx->transpen(palette,dest_bmp,clip,code,color,flipx,flipy,offsx,offsy,transparent_color); + gfx->transpen(dest_bmp,clip,code,color,flipx,flipy,offsx,offsy,transparent_color); return; } diff --git a/src/mame/video/k007121.c b/src/mame/video/k007121.c index d48d8b1437b..fef18719008 100644 --- a/src/mame/video/k007121.c +++ b/src/mame/video/k007121.c @@ -332,7 +332,7 @@ void k007121_device::sprites_draw( bitmap_ind16 &bitmap, const rectangle &clipre } if (pri_mask != -1) - gfx->prio_transmask(m_palette,bitmap,cliprect, + gfx->prio_transmask(bitmap,cliprect, number + x_offset[ex] + y_offset[ey], color, flipx,flipy, @@ -340,7 +340,7 @@ void k007121_device::sprites_draw( bitmap_ind16 &bitmap, const rectangle &clipre priority_bitmap,pri_mask, transparent_mask); else - gfx->transmask(m_palette,bitmap,cliprect, + gfx->transmask(bitmap,cliprect, number + x_offset[ex] + y_offset[ey], color, flipx,flipy, diff --git a/src/mame/video/k007420.c b/src/mame/video/k007420.c index d4471fa346c..362df77b1e6 100644 --- a/src/mame/video/k007420.c +++ b/src/mame/video/k007420.c @@ -183,14 +183,14 @@ void k007420_device::sprites_draw( bitmap_ind16 &bitmap, const rectangle &clipre else c += bank; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, c, color, flipx,flipy, sx,sy,0); if (m_regs[2] & 0x80) - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, c, color, flipx,flipy, @@ -227,7 +227,7 @@ void k007420_device::sprites_draw( bitmap_ind16 &bitmap, const rectangle &clipre else c += bank; - gfx->zoom_transpen(m_palette,bitmap,cliprect, + gfx->zoom_transpen(bitmap,cliprect, c, color, flipx,flipy, @@ -235,7 +235,7 @@ void k007420_device::sprites_draw( bitmap_ind16 &bitmap, const rectangle &clipre (zw << 16) / 8,(zh << 16) / 8,0); if (m_regs[2] & 0x80) - gfx->zoom_transpen(m_palette,bitmap,cliprect, + gfx->zoom_transpen(bitmap,cliprect, c, color, flipx,flipy, diff --git a/src/mame/video/k051960.c b/src/mame/video/k051960.c index 13893c0bf73..1e81128209c 100644 --- a/src/mame/video/k051960.c +++ b/src/mame/video/k051960.c @@ -523,20 +523,18 @@ void k051960_device::k051960_sprites_draw( bitmap_ind16 &bitmap, const rectangle c += yoffset[y]; if (max_priority == -1) - m_gfx->prio_transtable(m_palette,bitmap,cliprect, - c, - color, + m_gfx->prio_transtable(bitmap,cliprect, + c,color, flipx,flipy, sx & 0x1ff,sy, priority_bitmap,pri, - drawmode_table,m_palette->shadow_table()); + drawmode_table); else - m_gfx->transtable(m_palette,bitmap,cliprect, - c, - color, + m_gfx->transtable(bitmap,cliprect, + c,color, flipx,flipy, sx & 0x1ff,sy, - drawmode_table,m_palette->shadow_table()); + drawmode_table); } } } @@ -566,22 +564,20 @@ void k051960_device::k051960_sprites_draw( bitmap_ind16 &bitmap, const rectangle c += yoffset[y]; if (max_priority == -1) - m_gfx->prio_zoom_transtable(m_palette,bitmap,cliprect, - c, - color, + m_gfx->prio_zoom_transtable(bitmap,cliprect, + c,color, flipx,flipy, sx & 0x1ff,sy, (zw << 16) / 16,(zh << 16) / 16, priority_bitmap,pri, - drawmode_table,m_palette->shadow_table()); + drawmode_table); else - m_gfx->zoom_transtable(m_palette,bitmap,cliprect, - c, - color, + m_gfx->zoom_transtable(bitmap,cliprect, + c,color, flipx,flipy, sx & 0x1ff,sy, (zw << 16) / 16,(zh << 16) / 16, - drawmode_table,m_palette->shadow_table()); + drawmode_table); } } } diff --git a/src/mame/video/k053244_k053245.c b/src/mame/video/k053244_k053245.c index 84414cce198..839d02a28ff 100644 --- a/src/mame/video/k053244_k053245.c +++ b/src/mame/video/k053244_k053245.c @@ -539,24 +539,22 @@ void k05324x_device::k053245_sprites_draw( bitmap_ind16 &bitmap, const rectangle if (zoomx == 0x10000 && zoomy == 0x10000) { - m_gfx->prio_transtable(m_palette,bitmap,cliprect, - c, - color, + m_gfx->prio_transtable(bitmap,cliprect, + c,color, fx,fy, sx,sy, priority_bitmap,pri, - drawmode_table,m_palette->shadow_table()); + drawmode_table); } else { - m_gfx->prio_zoom_transtable(m_palette,bitmap,cliprect, - c, - color, + m_gfx->prio_zoom_transtable(bitmap,cliprect, + c,color, fx,fy, sx,sy, (zw << 16) / 16,(zh << 16) / 16, priority_bitmap,pri, - drawmode_table,m_palette->shadow_table()); + drawmode_table); } } @@ -787,24 +785,22 @@ void k05324x_device::k053245_sprites_draw_lethal( bitmap_ind16 &bitmap, const re if (zoomx == 0x10000 && zoomy == 0x10000) { - m_gfxdecode->gfx(0)->prio_transtable(m_palette,bitmap,cliprect, /* hardcoded to 0 (decoded 6bpp gfx) for le */ - c, - color, + m_gfxdecode->gfx(0)->prio_transtable(bitmap,cliprect, /* hardcoded to 0 (decoded 6bpp gfx) for le */ + c,color, fx,fy, sx,sy, priority_bitmap,pri, - drawmode_table,m_palette->shadow_table()); + drawmode_table); } else { - m_gfxdecode->gfx(0)->prio_zoom_transtable(m_palette,bitmap,cliprect, /* hardcoded to 0 (decoded 6bpp gfx) for le */ - c, - color, + m_gfxdecode->gfx(0)->prio_zoom_transtable(bitmap,cliprect, /* hardcoded to 0 (decoded 6bpp gfx) for le */ + c,color, fx,fy, sx,sy, (zw << 16) / 16,(zh << 16) / 16, priority_bitmap,pri, - drawmode_table,m_palette->shadow_table()); + drawmode_table); } } diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h index 48f951b0edf..9ed1c3045c5 100644 --- a/src/mame/video/k053246_k053247_k055673.h +++ b/src/mame/video/k053246_k053247_k055673.h @@ -411,48 +411,48 @@ public: { if (nozoom) { - m_gfx->prio_transtable(m_palette,bitmap,cliprect, + m_gfx->prio_transtable(bitmap,cliprect, tempcode, color, fx,fy, sx,sy, m_screen->priority(),primask, - whichtable,m_palette->shadow_table()); + whichtable); } else { - m_gfx->prio_zoom_transtable(m_palette,bitmap,cliprect, + m_gfx->prio_zoom_transtable(bitmap,cliprect, tempcode, color, fx,fy, sx,sy, (zw << 16) >> 4,(zh << 16) >> 4, m_screen->priority(),primask, - whichtable,m_palette->shadow_table()); + whichtable); } if (mirrory && height == 1) /* Simpsons shadows */ { if (nozoom) { - m_gfx->prio_transtable(m_palette,bitmap,cliprect, + m_gfx->prio_transtable(bitmap,cliprect, tempcode, color, fx,!fy, sx,sy, m_screen->priority(),primask, - whichtable,m_palette->shadow_table()); + whichtable); } else { - m_gfx->prio_zoom_transtable(m_palette,bitmap,cliprect, + m_gfx->prio_zoom_transtable(bitmap,cliprect, tempcode, color, fx,!fy, sx,sy, (zw << 16) >> 4,(zh << 16) >> 4, m_screen->priority(),primask, - whichtable,m_palette->shadow_table()); + whichtable); } } } diff --git a/src/mame/video/kan_panb.c b/src/mame/video/kan_panb.c index eb5bbc966fa..3da5b74dbaf 100644 --- a/src/mame/video/kan_panb.c +++ b/src/mame/video/kan_panb.c @@ -44,7 +44,7 @@ UINT32 snowbros_state::screen_update_honeydol(screen_device &screen, bitmap_ind1 sy = y; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tile, tilecolour, flipx, flipy, @@ -78,7 +78,7 @@ UINT32 snowbros_state::screen_update_honeydol(screen_device &screen, bitmap_ind1 tilecolour = (tilecolour&0x03f0) >> 4; tilecolour ^=0x3f; // unusual, but correct.. - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile, tilecolour, flipx, flipy, @@ -133,7 +133,7 @@ UINT32 snowbros_state::screen_update_twinadv(screen_device &screen, bitmap_ind16 tilecolour = (tilecolour&0x00f0) >> 4; tilecolour ^=0xf; // unusual, but correct.. - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile, tilecolour, flipx, flipy, @@ -175,7 +175,7 @@ UINT32 snowbros_state::screen_update_wintbob(screen_device &screen, bitmap_ind16 if ((xpos > -16) && (ypos > 0) && (xpos < 256) && (ypos < 240) && (disbl !=2)) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tilen, colr, flipx, flipy, @@ -263,7 +263,7 @@ UINT32 snowbros_state::screen_update_snowbro3(screen_device &screen, bitmap_ind1 tilecolour = 0x10; } - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile, (tilecolour & 0xf0) >> 4, flipx, flipy, diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c index 545e66abddb..37269509c6d 100644 --- a/src/mame/video/kan_pand.c +++ b/src/mame/video/kan_pand.c @@ -233,7 +233,7 @@ void kaneko_pandora_device::draw( bitmap_ind16 &bitmap, const rectangle &cliprec if (sy & 0x100) sy -= 0x200; - m_gfxdecode->gfx(m_gfx_region)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfx_region)->transpen(bitmap,cliprect, tile, (tilecolour & 0xf0) >> 4, flipx, flipy, diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index 5f9e0a172c0..93cb954693f 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_palette,*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_palette,*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 f0fce7718b6..0d8e9b92df9 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(m_palette,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(m_palette,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/kickgoal.c b/src/mame/video/kickgoal.c index 7b54a351337..7e0d6f9c35a 100644 --- a/src/mame/video/kickgoal.c +++ b/src/mame/video/kickgoal.c @@ -106,7 +106,7 @@ void kickgoal_state::kickgoal_draw_sprites(bitmap_ind16 &bitmap,const rectangle ypos = 0x110 - ypos; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tileno+m_sprbase, 0x30 + color, flipx,0, diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index ea494cd5289..f144c3a50c7 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -229,7 +229,7 @@ void kingofb_state::kingofb_draw_sprites(bitmap_ind16 &bitmap, const rectangle & flipy = !flipy; } - m_gfxdecode->gfx(2 + bank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2 + bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); @@ -286,7 +286,7 @@ void kingofb_state::ringking_draw_sprites( bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - m_gfxdecode->gfx(2 + bank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2 + bank)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index 8ca8843f179..1a1140e2799 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -221,7 +221,7 @@ void kncljoe_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec if (sx >= 256-8) sx -= 256; - gfx->transpen(m_palette,bitmap,clip, + gfx->transpen(bitmap,clip, code, color, flipx,flipy, diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c index 1f9eef8a894..75efb07e63c 100644 --- a/src/mame/video/ksayakyu.c +++ b/src/mame/video/ksayakyu.c @@ -102,7 +102,7 @@ void ksayakyu_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy ^= 1; } - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile & 0x7f, (attributes & 0x78) >> 3, flipx,flipy, diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index 0838fc5631b..bb053a987db 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -185,7 +185,7 @@ void kyugo_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c index 51a729a28b8..e74320435b3 100644 --- a/src/mame/video/ladybug.c +++ b/src/mame/video/ladybug.c @@ -253,14 +253,14 @@ void ladybug_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec if (spriteram[offs + i] & 0x80) { if (spriteram[offs + i] & 0x40) /* 16x16 */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (spriteram[offs + i + 1] >> 2) + 4 * (spriteram[offs + i + 2] & 0x10), spriteram[offs + i + 2] & 0x0f, spriteram[offs + i] & 0x20,spriteram[offs + i] & 0x10, spriteram[offs + i + 3], offs / 4 - 8 + (spriteram[offs + i] & 0x0f),0); else /* 8x8 */ - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, spriteram[offs + i + 1] + 16 * (spriteram[offs + i + 2] & 0x10), spriteram[offs + i + 2] & 0x0f, spriteram[offs + i] & 0x20,spriteram[offs + i] & 0x10, diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c index fe6bc04fbff..923a2db22b5 100644 --- a/src/mame/video/ladyfrog.c +++ b/src/mame/video/ladyfrog.c @@ -103,7 +103,7 @@ void ladyfrog_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre sy = 238 - m_spriteram[offs + 0]; flipx = ((m_spriteram[offs + 1] & 0x40)>>6); flipy = ((m_spriteram[offs + 1] & 0x80)>>7); - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, pal, flipx,flipy, @@ -112,7 +112,7 @@ void ladyfrog_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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, pal, flipx,flipy, diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index b6d16d21c64..2f61d6bc873 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -298,7 +298,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code | ((UINT16)m_gfxbank << 6), color, flipx, flipy, diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index 9bec2a1bd59..1cfa769fb1e 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -233,7 +233,7 @@ void lastduel_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/lazercmd.c b/src/mame/video/lazercmd.c index 1006ef8683a..f3a2f1e816c 100644 --- a/src/mame/video/lazercmd.c +++ b/src/mame/video/lazercmd.c @@ -67,7 +67,7 @@ UINT32 lazercmd_state::screen_update_lazercmd(screen_device &screen, bitmap_ind1 sx *= HORZ_CHR; sy *= VERT_CHR; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_videoram[i], video_inverted ? 1 : 0, 0,0, sx,sy); diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c index e34836c2e39..b723eabd96e 100644 --- a/src/mame/video/legionna.c +++ b/src/mame/video/legionna.c @@ -359,7 +359,7 @@ void legionna_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { - m_gfxdecode->gfx(3)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->prio_transpen(bitmap,cliprect, sprite++, color,fx,fy,(x+ax*16)+m_sprite_xoffs,y+ay*16+m_sprite_yoffs, screen.priority(),pri_mask, 15); @@ -370,7 +370,7 @@ void legionna_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { - m_gfxdecode->gfx(3)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->prio_transpen(bitmap,cliprect, sprite++, color,fx,fy,(x+ax*16)+m_sprite_xoffs,y+(dy-ay-1)*16+m_sprite_yoffs, screen.priority(),pri_mask,15); @@ -384,7 +384,7 @@ void legionna_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { - m_gfxdecode->gfx(3)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->prio_transpen(bitmap,cliprect, sprite++, color,fx,fy,(x+(dx-ax-1)*16)+m_sprite_xoffs,y+ay*16+m_sprite_yoffs, screen.priority(),pri_mask,15); @@ -395,7 +395,7 @@ void legionna_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co for (ax=0; ax<dx; ax++) for (ay=0; ay<dy; ay++) { - m_gfxdecode->gfx(3)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->prio_transpen(bitmap,cliprect, sprite++, color,fx,fy,(x+(dx-ax-1)*16)+m_sprite_xoffs,y+(dy-ay-1)*16+m_sprite_yoffs, screen.priority(),pri_mask, 15); diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index 6578431a423..6d5050e6a27 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -332,13 +332,13 @@ void liberate_state::liberate_draw_sprites( bitmap_ind16 &bitmap, const rectangl sy2 = sy + 16; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx,fy, sx,sy,0); if (multi) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code+1, color, fx,fy, @@ -396,13 +396,13 @@ void liberate_state::prosport_draw_sprites( bitmap_ind16 &bitmap, const rectangl sy2 = sy + 16; } - m_gfxdecode->gfx(gfx_region)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx_region)->transpen(bitmap,cliprect, code, color, fx,fy, sx,sy,0); if (multi) - m_gfxdecode->gfx(gfx_region)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx_region)->transpen(bitmap,cliprect, code2, color, fx,fy, @@ -456,13 +456,13 @@ void liberate_state::boomrang_draw_sprites( bitmap_ind16 &bitmap, const rectangl sy2 = sy + 16; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, fx,fy, sx,sy,0); if (multi) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code2, color, fx,fy, @@ -486,7 +486,7 @@ void liberate_state::prosoccr_draw_sprites( bitmap_ind16 &bitmap, const rectangl fx = spriteram[offs + 0] & 4; fy = spriteram[offs + 0] & 2; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, fx,fy, @@ -546,7 +546,7 @@ UINT32 liberate_state::screen_update_prosport(screen_device &screen, bitmap_ind1 my = (offs) % 32; mx = (offs) / 32; - m_gfxdecode->gfx(gfx_region)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx_region)->transpen(bitmap,cliprect, tile, 1, 0, 0, 248 - 8 * mx, 8 * my, 0); } diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c index e174a7f74f5..f935efdc5a1 100644 --- a/src/mame/video/lkage.c +++ b/src/mame/video/lkage.c @@ -148,7 +148,7 @@ void lkage_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, con for (y = 0; y < height; y++) { - m_gfxdecode->gfx(1)->prio_transpen(m_palette, + m_gfxdecode->gfx(1)->prio_transpen( bitmap, cliprect, sprite_number ^ y, diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c index e5ccf6eb33e..396384bfeaa 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(m_palette,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/lsasquad.c b/src/mame/video/lsasquad.c index 34b0f071ba5..4af72995986 100644 --- a/src/mame/video/lsasquad.c +++ b/src/mame/video/lsasquad.c @@ -32,13 +32,13 @@ void lsasquad_state::draw_layer( bitmap_ind16 &bitmap, const rectangle &cliprect code = m_videoram[base + 2 * y] + ((attr & 0x0f) << 8); color = attr >> 4; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flip_screen(),flip_screen(), sx,sy,15); if (sx > 248) /* wraparound */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flip_screen(),flip_screen(), @@ -119,13 +119,13 @@ int lsasquad_state::draw_layer_daikaiju( bitmap_ind16 &bitmap, const rectangle & if ((type == 0 && color != 0x0d) || (type != 0 && color == 0x0d)) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flip_screen(),flip_screen(), sx,sy,15); if (sx > 248) /* wraparound */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flip_screen(),flip_screen(), @@ -180,13 +180,13 @@ void lsasquad_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, sx,sy,15); /* wraparound */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index 385d6b313a0..a32131d5e58 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -191,7 +191,7 @@ void lwings_state::lwings_draw_sprites( bitmap_ind16 &bitmap, const rectangle &c flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code,color, flipx,flipy, sx,sy,15); @@ -239,7 +239,7 @@ void lwings_state::trojan_draw_sprites( bitmap_ind16 &bitmap, const rectangle &c flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code,color, flipx,flipy, sx,sy,15); diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index 4273fd0e787..817d8c66f9d 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -130,9 +130,9 @@ UINT32 m10_state::screen_update_m10(screen_device &screen, bitmap_ind16 &bitmap, for (i = 0; i < 4; i++) if (m_flip) - m_back_gfx->opaque(m_palette,bitmap,cliprect, i, color[i], 1, 1, 31 * 8 - xpos[i], 0); + m_back_gfx->opaque(bitmap,cliprect, i, color[i], 1, 1, 31 * 8 - xpos[i], 0); else - m_back_gfx->opaque(m_palette,bitmap,cliprect, i, color[i], 0, 0, xpos[i], 0); + m_back_gfx->opaque(bitmap,cliprect, i, color[i], 0, 0, xpos[i], 0); if (m_bottomline) { diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c index 763021737d1..ca7dde7f667 100644 --- a/src/mame/video/m107.c +++ b/src/mame/video/m107.c @@ -183,7 +183,7 @@ void m107_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const for (i=0; i<y_multi; i++) { - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite + s_ptr, colour, fx,fy, @@ -191,7 +191,7 @@ void m107_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const screen.priority(),pri_mask,0); /* wrap-around y */ - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite + s_ptr, colour, fx,fy, @@ -240,7 +240,7 @@ void m107_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const if (!ffy) sprite+=y_multi-1; for (i=0; i<y_multi; i++) { - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite+(ffy?i:-i), colour, ffx,ffy, @@ -248,7 +248,7 @@ void m107_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const screen.priority(),pri_mask,0); /* wrap-around y */ - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite+(ffy?i:-i), colour, ffx,ffy, diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index 2b714c1a694..54e425b40b7 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -306,7 +306,7 @@ void m52_state::draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, ypos = ypos + (22 - 8); - m_gfxdecode->gfx(image)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(image)->transpen(bitmap,cliprect, 0, 0, flip_screen(), flip_screen(), @@ -314,7 +314,7 @@ void m52_state::draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, ypos, 0); - m_gfxdecode->gfx(image)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(image)->transpen(bitmap,cliprect, 0, 0, flip_screen(), flip_screen(), @@ -408,7 +408,7 @@ UINT32 m52_state::screen_update_m52(screen_device &screen, bitmap_ind16 &bitmap, clip = cliprect; #endif - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,clip, + m_gfxdecode->gfx(1)->transmask(bitmap,clip, code, color, flipx, flipy, sx, sy, m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 512 + 32)); } diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c index 142125b79c8..aa8ee80b5a3 100644 --- a/src/mame/video/m57.c +++ b/src/mame/video/m57.c @@ -239,7 +239,7 @@ void m57_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) flipy = !flipy; } - m_gfxdecode->gfx(1 + bank)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1 + bank)->transmask(bitmap,cliprect, tile_number, color, flipx, flipy, diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c index a1506410841..8da503c3369 100644 --- a/src/mame/video/m58.c +++ b/src/mame/video/m58.c @@ -207,7 +207,7 @@ WRITE8_MEMBER(m58_state::yard_flipscreen_w) * *************************************/ -#define DRAW_SPRITE(code, sy) m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy, m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 512)); +#define DRAW_SPRITE(code, sy) m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 512)); void m58_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ) { diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index 7af34d0b78c..4fc27250963 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -382,7 +382,7 @@ void m62_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, i do { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + i * incr,col, flipx,flipy, sx,sy + 16 * i,0); diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c index a26f615be36..228d4ab7d33 100644 --- a/src/mame/video/m72.c +++ b/src/mame/video/m72.c @@ -450,7 +450,7 @@ void m72_state::m72_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) if (flipy) c += h-1-y; else c += y; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, c, color, flipx,flipy, @@ -502,7 +502,7 @@ void m72_state::majtitle_draw_sprites(bitmap_ind16 &bitmap,const rectangle &clip if (flipy) c += h-1-y; else c += y; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, c, color, flipx,flipy, diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c index e16dba549a2..49c6cab0442 100644 --- a/src/mame/video/m90.c +++ b/src/mame/video/m90.c @@ -157,7 +157,7 @@ void m90_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const r for (i = 0;i < y_multi;i++) if (m_video_control_data[7] & 0x01) - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite + (fy ? y_multi-1 - i : i), colour, fx,fy, @@ -165,7 +165,7 @@ void m90_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const r screen.priority(), (colour & 0x08) ? 0x00 : 0x02,0); else if (m_video_control_data[7] & 0x02) - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite + (fy ? y_multi-1 - i : i), colour, fx,fy, @@ -173,7 +173,7 @@ void m90_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const r screen.priority(), ((colour & 0x0c)==0x0c) ? 0x00 : 0x02,0); else - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite + (fy ? y_multi-1 - i : i), colour, fx,fy, @@ -212,7 +212,7 @@ void m90_state::bomblord_draw_sprites(screen_device &screen, bitmap_ind16 &bitma fx = (spriteram16[offs+3] >> 8) & 0x02; fy = (spriteram16[offs+2] >> 8) & 0x80; - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite, colour, fx,fy, @@ -250,7 +250,7 @@ void m90_state::dynablsb_draw_sprites(screen_device &screen, bitmap_ind16 &bitma fx = (spriteram16[offs+3] >> 8) & 0x02; fy = (spriteram16[offs+2] >> 8) & 0x80; - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, sprite, colour, fx,fy, diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index 7ecac6112df..45fee1cf2ef 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -355,26 +355,26 @@ void m92_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const { if (flip_screen()) { - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + s_ptr, color, !flipx, !flipy, 464 - x, 240 - (y - row * 16), screen.priority(), pri, 0); // wrap around x - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + s_ptr, color, !flipx, !flipy, 464 - x + 512, 240 - (y - row * 16), screen.priority(), pri, 0); } else { - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + s_ptr, color, flipx, flipy, x, y - row * 16, screen.priority(), pri, 0); // wrap around x - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + s_ptr, color, flipx, flipy, x - 512, y - row * 16, screen.priority(), pri, 0); @@ -429,26 +429,26 @@ void m92_state::ppan_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c { if (flip_screen()) { - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + s_ptr, color, !flipx, !flipy, 464 - x, 240 - (y - row * 16), screen.priority(), pri, 0); // wrap around x - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + s_ptr, color, !flipx, !flipy, 464 - x + 512, 240 - (y - row * 16), screen.priority(), pri, 0); } else { - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + s_ptr, color, flipx, flipy, x, y - row * 16, screen.priority(), pri, 0); // wrap around x - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + s_ptr, color, flipx, flipy, x - 512, y - row * 16, screen.priority(), pri, 0); diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index 548b6de2072..9ee66f2d603 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -235,7 +235,7 @@ void macrossp_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprec xoffset = 0; for (xcnt = 0; xcnt <= wide; xcnt++) { - gfx->zoom_alpha(m_palette,bitmap,cliprect,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); + gfx->zoom_alpha(bitmap,cliprect,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); xoffset += ((xzoom*16 + (1<<7)) >> 8); loopno++; @@ -252,7 +252,7 @@ void macrossp_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprec xoffset = 0; for (xcnt = 0; xcnt <= wide; xcnt++) { - gfx->zoom_alpha(m_palette,bitmap,cliprect,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); + gfx->zoom_alpha(bitmap,cliprect,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); xoffset += ((xzoom * 16 + (1 << 7)) >> 8); loopno++; @@ -272,7 +272,7 @@ void macrossp_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprec xoffset = ((wide*xzoom*16) >> 8); for (xcnt = wide; xcnt >= 0; xcnt--) { - gfx->zoom_alpha(m_palette,bitmap,cliprect,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); + gfx->zoom_alpha(bitmap,cliprect,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); xoffset -= ((xzoom * 16 + (1 << 7)) >> 8); loopno++; @@ -289,7 +289,7 @@ void macrossp_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprec xoffset = ((wide * xzoom * 16) >> 8); for (xcnt = wide; xcnt >=0 ; xcnt--) { - gfx->zoom_alpha(m_palette,bitmap,cliprect,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); + gfx->zoom_alpha(bitmap,cliprect,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); xoffset -= ((xzoom * 16 + (1 << 7)) >> 8); loopno++; diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index f0ab4bff899..a21008ba65b 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -145,8 +145,8 @@ VIDEO_START_MEMBER(madalien_state,madalien) m_gfxdecode->gfx(0)->set_source(m_charram); - m_gfxdecode->gfx(2)->opaque(m_palette,*m_headlight_bitmap,m_headlight_bitmap->cliprect(), 0, 0, 0, 0, 0x00, 0x00); - m_gfxdecode->gfx(2)->opaque(m_palette,*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 6015d71f61f..9772096fd49 100644 --- a/src/mame/video/magmax.c +++ b/src/mame/video/magmax.c @@ -197,7 +197,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, @@ -227,7 +227,7 @@ UINT32 magmax_state::screen_update_magmax(screen_device &screen, bitmap_ind16 &b sy = 31 - sy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, 0, m_flipscreen, m_flipscreen, diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c index be283043d13..78d4ff14e09 100644 --- a/src/mame/video/mainsnk.c +++ b/src/mame/video/mainsnk.c @@ -147,7 +147,7 @@ void mainsnk_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile_number, color, flipx,flipy, diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c index f382acee2ea..0bf6f632552 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(m_palette,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/mappy.c b/src/mame/video/mappy.c index 303a3c5bdd6..eaa974d54ca 100644 --- a/src/mame/video/mappy.c +++ b/src/mame/video/mappy.c @@ -418,7 +418,7 @@ void mappy_state::mappy_draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip { for (x = 0;x <= sizex;x++) { - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, sprite + gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)], color, flipx,flipy, @@ -495,7 +495,7 @@ void mappy_state::phozon_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cli { for (x = 0;x <= sizex;x++) { - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, sprite + gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)], color, flipx,flipy, diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c index 08574f9984f..3737d107f78 100644 --- a/src/mame/video/marineb.c +++ b/src/mame/video/marineb.c @@ -213,7 +213,7 @@ UINT32 marineb_state::screen_update_marineb(screen_device &screen, bitmap_ind16 sx++; } - m_gfxdecode->gfx(gfx)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx)->transpen(bitmap,cliprect, code, col, flipx,flipy, @@ -255,7 +255,7 @@ UINT32 marineb_state::screen_update_changes(screen_device &screen, bitmap_ind16 sx++; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code >> 2, col, flipx,flipy, @@ -284,7 +284,7 @@ UINT32 marineb_state::screen_update_changes(screen_device &screen, bitmap_ind16 code >>= 4; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, col, flipx,flipy, @@ -292,7 +292,7 @@ UINT32 marineb_state::screen_update_changes(screen_device &screen, bitmap_ind16 /* draw again for wrap around */ - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, col, flipx,flipy, @@ -350,7 +350,7 @@ UINT32 marineb_state::screen_update_springer(screen_device &screen, bitmap_ind16 sx--; } - m_gfxdecode->gfx(gfx)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx)->transpen(bitmap,cliprect, code, col, flipx,flipy, @@ -393,7 +393,7 @@ UINT32 marineb_state::screen_update_hoccer(screen_device &screen, bitmap_ind16 & flipx = !flipx; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code >> 2, col, flipx,flipy, @@ -451,7 +451,7 @@ UINT32 marineb_state::screen_update_hopprobo(screen_device &screen, bitmap_ind16 sx--; } - m_gfxdecode->gfx(gfx)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx)->transpen(bitmap,cliprect, code, col, flipx,flipy, diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c index 9789d36928b..4717bb9579c 100644 --- a/src/mame/video/mario.c +++ b/src/mame/video/mario.c @@ -173,7 +173,7 @@ void mario_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) { y -= 14; x -= 7; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_spriteram[offs + 2], (m_spriteram[offs + 1] & 0x0f) + 16 * m_palette_bank + 32 * m_monitor, !(m_spriteram[offs + 1] & 0x80),!(m_spriteram[offs + 1] & 0x40), @@ -183,7 +183,7 @@ void mario_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) { y += 1; x -= 8; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_spriteram[offs + 2], (m_spriteram[offs + 1] & 0x0f) + 16 * m_palette_bank + 32 * m_monitor, (m_spriteram[offs + 1] & 0x80),(m_spriteram[offs + 1] & 0x40), diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c index b6668dc7a8b..85b443044d3 100644 --- a/src/mame/video/markham.c +++ b/src/mame/video/markham.c @@ -102,7 +102,7 @@ void markham_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec if (px > 248) px = px - 256; - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, chr, col, fx,fy, diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c index fd2809632b2..6e71b0332c8 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_palette,*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_palette,*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(m_palette,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, @@ -187,7 +187,7 @@ UINT32 matmania_state::screen_update_matmania(screen_device &screen, bitmap_ind1 int sx = 31 - offs / 32; int sy = offs % 32; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_videoram2[offs] + 256 * (m_colorram2[offs] & 0x07), (m_colorram2[offs] & 0x30) >> 4, 0,0, @@ -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_palette,*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_palette,*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 */ @@ -245,7 +245,7 @@ UINT32 matmania_state::screen_update_maniach(screen_device &screen, bitmap_ind16 { if (spriteram[offs] & 0x01) { - m_gfxdecode->gfx(2)->transpen(m_palette,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, @@ -260,7 +260,7 @@ UINT32 matmania_state::screen_update_maniach(screen_device &screen, bitmap_ind16 int sx = 31 - offs / 32; int sy = offs % 32; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_videoram2[offs] + 256 * (m_colorram2[offs] & 0x07), (m_colorram2[offs] & 0x30) >> 4, 0,0, diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c index f2bf405e08b..d3fc7dcaf19 100644 --- a/src/mame/video/mcr3.c +++ b/src/mame/video/mcr3.c @@ -277,21 +277,21 @@ void mcr3_state::mcr3_update_sprites(screen_device &screen, bitmap_ind16 &bitmap if (!mcr_cocktail_flip) { /* first draw the sprite, visible */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, screen.priority(), 0x00, 0x0101); /* then draw the mask, behind the background but obscuring following sprites */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, screen.priority(), 0x02, 0xfeff); } else { /* first draw the sprite, visible */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, code, color, !flipx, !flipy, 480 - sx, 452 - sy, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, !flipx, !flipy, 480 - sx, 452 - sy, screen.priority(), 0x00, 0x0101); /* then draw the mask, behind the background but obscuring following sprites */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, code, color, !flipx, !flipy, 480 - sx, 452 - sy, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, !flipx, !flipy, 480 - sx, 452 - sy, screen.priority(), 0x02, 0xfeff); } } diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c index 99d019b0aea..a84ea4dd29b 100644 --- a/src/mame/video/mcr68.c +++ b/src/mame/video/mcr68.c @@ -240,11 +240,11 @@ void mcr68_state::mcr68_update_sprites(screen_device &screen, bitmap_ind16 &bitm The color 8 is used to cover over other sprites. */ /* first draw the sprite, visible */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,sprite_clip, code, color, flipx, flipy, x, y, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,sprite_clip, code, color, flipx, flipy, x, y, screen.priority(), 0x00, 0x0101); /* then draw the mask, behind the background but obscuring following sprites */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,sprite_clip, code, color, flipx, flipy, x, y, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,sprite_clip, code, color, flipx, flipy, x, y, screen.priority(), 0x02, 0xfeff); } } @@ -297,11 +297,11 @@ void mcr68_state::zwackery_update_sprites(screen_device &screen, bitmap_ind16 &b The color 8 is used to cover over other sprites. */ /* first draw the sprite, visible */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, code, color, flipx, flipy, x, y, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx, flipy, x, y, screen.priority(), 0x00, 0x0101); /* then draw the mask, behind the background but obscuring following sprites */ - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, code, color, flipx, flipy, x, y, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx, flipy, x, y, screen.priority(), 0x02, 0xfeff); } } diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c index ad5407f1139..44eaa6ac488 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(m_palette,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/megasys1.c b/src/mame/video/megasys1.c index 7bb38a46f0c..3abd0c191d8 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -597,7 +597,7 @@ void megasys1_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co code = spritedata[0x0E/2] + objectdata[0x06/2]; color = (attr & color_mask); - m_gfxdecode->gfx(3)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->prio_transpen(bitmap,cliprect, (code & 0xfff ) + ((m_sprite_bank & 1) << 12), color, flipx, flipy, @@ -637,7 +637,7 @@ void megasys1_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co sx = 240-sx; sy = 240-sy; } - m_gfxdecode->gfx(2)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->prio_transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/megazone.c b/src/mame/video/megazone.c index 433bfea5cd0..dbe5a518e4f 100644 --- a/src/mame/video/megazone.c +++ b/src/mame/video/megazone.c @@ -130,7 +130,7 @@ UINT32 megazone_state::screen_update_megazone(screen_device &screen, bitmap_ind1 flipy = !flipy; } - m_gfxdecode->gfx(1)->opaque(m_palette,*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, @@ -177,7 +177,7 @@ UINT32 megazone_state::screen_update_megazone(screen_device &screen, bitmap_ind1 else sx = sx + 32; - m_gfxdecode->gfx(0)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, spriteram[offs + 2], color, flipx,flipy, @@ -210,7 +210,7 @@ UINT32 megazone_state::screen_update_megazone(screen_device &screen, bitmap_ind1 - m_gfxdecode->gfx(1)->opaque(m_palette,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 2da8a3f4eea..8e76a1faabb 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -209,7 +209,7 @@ void mermaid_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,(flip_screen_x() ? flip_spritevisiblearea : spritevisiblearea), code, color, flipx, flipy, sx, sy, 0); + m_gfxdecode->gfx(1)->transpen(bitmap,(flip_screen_x() ? flip_spritevisiblearea : spritevisiblearea), code, color, flipx, flipy, sx, sy, 0); } } @@ -304,7 +304,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_palette,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); @@ -315,7 +315,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_palette,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); @@ -353,10 +353,10 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state) sy2 = 240 - sy2; } - m_gfxdecode->gfx(1)->transpen(m_palette,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_palette,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); } @@ -434,10 +434,10 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state) sy2 = 240 - sy2; } - m_gfxdecode->gfx(1)->transpen(m_palette,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_palette,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); } @@ -515,10 +515,10 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state) sy2 = 240 - sy2; } - m_gfxdecode->gfx(1)->transpen(m_palette,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_palette,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/metlclsh.c b/src/mame/video/metlclsh.c index e6b631a2111..570e2c0b5fa 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -201,15 +201,15 @@ void metlclsh_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre { if (sizey) { - gfx->transpen(m_palette,bitmap,cliprect, code & ~1, color, flipx,flipy, + gfx->transpen(bitmap,cliprect, code & ~1, color, flipx,flipy, sx, sy + (flipy ? 0 : -16) + wrapy,0); - gfx->transpen(m_palette,bitmap,cliprect, code | 1, color, flipx,flipy, + gfx->transpen(bitmap,cliprect, code | 1, color, flipx,flipy, sx,sy + (flipy ? -16 : 0) + wrapy,0); } else { - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx,flipy, + gfx->transpen(bitmap,cliprect, code, color, flipx,flipy, sx,sy + wrapy,0); } } diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index 7076895beb5..c92fd347008 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -502,7 +502,7 @@ void metro_state::metro_draw_sprites( screen_device &screen, bitmap_ind16 &bitma gfx_element gfx(m_palette, base_gfx8 + gfxstart, width, height, width, m_palette->entries(), 0, 256); - gfx.prio_zoom_transpen(m_palette, bitmap,cliprect, + gfx.prio_zoom_transpen(bitmap,cliprect, 0, color_start >> 4, flipx, flipy, @@ -518,7 +518,7 @@ void metro_state::metro_draw_sprites( screen_device &screen, bitmap_ind16 &bitma gfx_element gfx(m_palette, base_gfx4 + 2 * gfxstart, width, height, width, m_palette->entries(),0, 16); - gfx.prio_zoom_transpen(m_palette, bitmap,cliprect, + gfx.prio_zoom_transpen(bitmap,cliprect, 0, color + color_start, flipx, flipy, diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c index e8c3b4ce18a..83b440f44b0 100644 --- a/src/mame/video/mexico86.c +++ b/src/mame/video/mexico86.c @@ -85,7 +85,7 @@ UINT32 mexico86_state::screen_update_mexico86(screen_device &screen, bitmap_ind1 x = (sx + xc * 8) & 0xff; y = (sy + yc * 8) & 0xff; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -143,7 +143,7 @@ UINT32 mexico86_state::screen_update_kikikai(screen_device &screen, bitmap_ind16 color = (m_videoram[goffs + 1] & 0xe0) >> 5; goffs += 0x40; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, 0,0, @@ -152,7 +152,7 @@ UINT32 mexico86_state::screen_update_kikikai(screen_device &screen, bitmap_ind16 code = m_videoram[goffs] + ((m_videoram[goffs + 1] & 0x1f) << 8); color = (m_videoram[goffs + 1] & 0xe0) >> 5; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, 0,0, diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index 53f6dd58062..b4fb6693b9a 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -157,7 +157,7 @@ void mikie_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) } - m_gfxdecode->gfx(gfxbank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfxbank)->transpen(bitmap,cliprect, code, color, flipx,flipy, sx,sy, 0); diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index e9868147601..cc167a9099d 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -274,7 +274,7 @@ void mitchell_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre sx = 496 - sx; sy = 240 - sy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, m_flipscreen, m_flipscreen, diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index 5f0a2aeeeb3..eb668c02590 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -112,7 +112,7 @@ void mjkjidai_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect sx += 16; sy += 1; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c index 049c4e88c3f..cb4ae935619 100644 --- a/src/mame/video/momoko.c +++ b/src/mame/video/momoko.c @@ -142,7 +142,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b py = 248 - (8 * y + dy + 9); } - m_gfxdecode->gfx(1)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, chr, col, flip,flip, @@ -176,7 +176,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b py = y + 1; } - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, chr, col, !fx,fy, @@ -238,7 +238,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b px = 248 - x; py = y + 1; } - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, chr, col, !fx,fy, @@ -271,7 +271,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b px = 248 - x * 8; py = 255 - y; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_videoram[(sy >> 3) * 32 + x] * 8 + dy, col, flip,0, @@ -304,7 +304,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b px = 248 - (8 * x + dx - 8); py = 248 - (8 * y + dy + 9); } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, chr, 0, /* color */ flip,flip, /* flip */ diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c index 68f9c0ff4b9..df60d550fb3 100644 --- a/src/mame/video/mouser.c +++ b/src/mame/video/mouser.c @@ -90,7 +90,7 @@ UINT32 mouser_state::screen_update_mouser(screen_device &screen, bitmap_ind16 &b /* Note: this is _not_ dependant on flipping */ color_offs = offs % 32 + ((256 + 8 * (offs / 32) - spriteram[offs % 32] )% 256) / 8 * 32; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_videoram[offs] | (m_colorram[color_offs] >> 5) * 256 | ((m_colorram[color_offs] >> 4) & 1) * 512, m_colorram[color_offs]%16, flip_screen_x(),flip_screen_y(), @@ -121,7 +121,7 @@ UINT32 mouser_state::screen_update_mouser(screen_device &screen, bitmap_ind16 &b } if (BIT(spriteram[offs + 1], 4)) - m_gfxdecode->gfx(1+((spriteram[offs+1]&0x20)>>5))->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1+((spriteram[offs+1]&0x20)>>5))->transpen(bitmap,cliprect, spriteram[offs]&0x3f, spriteram[offs+1]%16, flipx,flipy, @@ -150,7 +150,7 @@ UINT32 mouser_state::screen_update_mouser(screen_device &screen, bitmap_ind16 &b } if (BIT(spriteram[offs + 1], 4)) - m_gfxdecode->gfx(1+((spriteram[offs+1]&0x20)>>5))->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1+((spriteram[offs+1]&0x20)>>5))->transpen(bitmap,cliprect, spriteram[offs]&0x3f, spriteram[offs+1]%16, flipx,flipy, diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 8d9b3e9fcf3..e783b097f7c 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -237,7 +237,7 @@ void mrdo_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ) { if (spriteram[offs + 1] != 0) { - m_gfxdecode->gfx(2)->transpen(m_palette,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/mrflea.c b/src/mame/video/mrflea.c index d12f10bad41..53b1d886f7f 100644 --- a/src/mame/video/mrflea.c +++ b/src/mame/video/mrflea.c @@ -55,12 +55,12 @@ void mrflea_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect int ypos = source[0] - 16 + 3; int tile_number = source[2] + source[3] * 0x100; - gfx->transpen(m_palette,bitmap,clip, + gfx->transpen(bitmap,clip, tile_number, 0, /* color */ 0,0, /* no flip */ xpos,ypos,0 ); - gfx->transpen(m_palette,bitmap,clip, + gfx->transpen(bitmap,clip, tile_number, 0, /* color */ 0,0, /* no flip */ @@ -89,7 +89,7 @@ void mrflea_state::draw_background( bitmap_ind16 &bitmap, const rectangle &clipr int tile_number = base + source[0] + source[0x400] * 0x100; source++; - gfx->opaque(m_palette,bitmap,cliprect, + gfx->opaque(bitmap,cliprect, tile_number, 0, /* color */ 0,0, /* no flip */ diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index 056a265d14f..d9458f39789 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -130,7 +130,7 @@ void mrjong_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprt, color, flipx, flipy, diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c index c9e88eae48a..325de1f0e43 100644 --- a/src/mame/video/msisaac.c +++ b/src/mame/video/msisaac.c @@ -176,41 +176,41 @@ void msisaac_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec switch (attributes & 3) { case 0: /* flipx==0 && flipy==0 */ - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number+1,color, flipx,flipy, sx,sy-16,0 ); - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number,color, flipx,flipy, sx,sy,0 ); break; case 1: /* flipx==1 && flipy==0 */ - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number+1,color, flipx,flipy, sx,sy-16,0 ); - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number,color, flipx,flipy, sx,sy,0 ); break; case 2: /* flipx==0 && flipy==1 */ - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number,color, flipx,flipy, sx,sy-16,0 ); - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number+1,color, flipx,flipy, sx,sy,0 ); break; case 3: /* flipx==1 && flipy==1 */ - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number,color, flipx,flipy, sx,sy-16,0 ); - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number+1,color, flipx,flipy, sx,sy,0 ); @@ -219,7 +219,7 @@ void msisaac_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec } else { - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number, color, flipx,flipy, diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index 2cd0bb61243..d41ddc1f27a 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -44,7 +44,7 @@ void mugsmash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec ypos -= 16; - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, num, diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c index 433bee4003c..0d8c6e4d404 100644 --- a/src/mame/video/munchmo.c +++ b/src/mame/video/munchmo.c @@ -64,7 +64,7 @@ void munchmo_state::draw_status( bitmap_ind16 &bitmap, const rectangle &cliprect for (sy = 0; sy < 256; sy += 8) { - gfx->opaque(m_palette,bitmap,cliprect, + gfx->opaque(bitmap,cliprect, *source++, 0, /* color */ 0,0, /* no flip */ @@ -94,7 +94,7 @@ void munchmo_state::draw_background( bitmap_ind16 &bitmap, const rectangle &clip { for (col = 0; col < 4; col++) { - gfx->opaque(m_palette,*m_tmpbitmap,m_tmpbitmap->cliprect(), + gfx->opaque(*m_tmpbitmap,m_tmpbitmap->cliprect(), rom[col + tile_number * 4 + row * 0x400], m_palette_bank, 0,0, /* flip */ @@ -135,7 +135,7 @@ void munchmo_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec { sx = (sx >> 1) | (tile_number & 0x80); sx = 2 * ((- 32 - scroll - sx) & 0xff) + xadjust; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, 0x7f - (tile_number & 0x7f), color_base - (attributes & 0x03), 0,0, /* no flip */ diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c index 92bcf24ea92..34bf0058512 100644 --- a/src/mame/video/mustache.c +++ b/src/mame/video/mustache.c @@ -130,7 +130,7 @@ void mustache_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec sy = 240 - sy; } - gfx->transpen(m_palette,bitmap,clip, + gfx->transpen(bitmap,clip, code, color, flip_screen(),flip_screen(), diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index 3bd9e5b9ad5..9a3475c1e80 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -197,7 +197,7 @@ void mystston_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, x, y, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 0); } } } diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c index a67d13178d5..fcef450b047 100644 --- a/src/mame/video/namcos1.c +++ b/src/mame/video/namcos1.c @@ -345,7 +345,7 @@ static void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rect gfx->set_source_clip(tx, sizex, ty, sizey); if (color != 0x7f) - gfx->prio_transpen(state->m_palette,bitmap,cliprect, + gfx->prio_transpen(bitmap,cliprect, sprite, color, flipx,flipy, @@ -354,14 +354,14 @@ static void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rect screen.priority(), pri_mask, 0xf); else - gfx->prio_transtable(state->m_palette,bitmap,cliprect, + gfx->prio_transtable(bitmap,cliprect, sprite, color, flipx,flipy, sx & 0x1ff, ((sy + 16) & 0xff) - 16, screen.priority(), pri_mask, - state->m_drawmode_table, state->m_palette->shadow_table()); + state->m_drawmode_table); source -= 0x10; } diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c index 7145fd657ff..f22b7658e3f 100644 --- a/src/mame/video/namcos86.c +++ b/src/mame/video/namcos86.c @@ -320,7 +320,7 @@ static void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rect sy++; /* sprites are buffered and delayed by one scanline */ gfx->set_source_clip(tx, sizex, ty, sizey); - gfx->prio_transpen(state->m_palette,bitmap,cliprect, + gfx->prio_transpen(bitmap,cliprect, sprite, color, flipx,flipy, diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c index 087da342815..508a93241e7 100644 --- a/src/mame/video/naughtyb.c +++ b/src/mame/video/naughtyb.c @@ -224,13 +224,13 @@ UINT32 naughtyb_state::screen_update_naughtyb(screen_device &screen, bitmap_ind1 } } - m_gfxdecode->gfx(0)->opaque(m_palette,tmpbitmap,tmpbitmap.cliprect(), + m_gfxdecode->gfx(0)->opaque(tmpbitmap,tmpbitmap.cliprect(), m_videoram2[offs] + 256 * m_bankreg, (m_videoram2[offs] >> 5) + 8 * m_palreg, m_cocktail,m_cocktail, 8*sx,8*sy); - m_gfxdecode->gfx(1)->transpen(m_palette,tmpbitmap,tmpbitmap.cliprect(), + m_gfxdecode->gfx(1)->transpen(tmpbitmap,tmpbitmap.cliprect(), videoram[offs] + 256*m_bankreg, (videoram[offs] >> 5) + 8 * m_palreg, m_cocktail,m_cocktail, diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index bafbe0b6f87..8de86560f86 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -386,7 +386,7 @@ void nemesis_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, c flipy = !flipy; } - m_gfxdecode->gfx(char_type)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(char_type)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c index 26268e5ec05..5df49a810e5 100644 --- a/src/mame/video/ninjakd2.c +++ b/src/mame/video/ninjakd2.c @@ -384,7 +384,7 @@ void ninjakd2_state::draw_sprites( bitmap_ind16 &bitmap) { int const tile = code ^ (x << big_xshift) ^ (y << big_yshift); - gfx->transpen(m_palette,bitmap,bitmap.cliprect(), + gfx->transpen(bitmap,bitmap.cliprect(), tile, color, flipx,flipy, diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c index ac4bc8cb06e..abdda200b66 100644 --- a/src/mame/video/ninjaw.c +++ b/src/mame/video/ninjaw.c @@ -76,7 +76,7 @@ void ninjaw_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect cury = y; code = tilenum; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx, flipy, curx, cury, 0); diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c index fd6644bc373..0304b7bf796 100644 --- a/src/mame/video/nmk16.c +++ b/src/mame/video/nmk16.c @@ -415,7 +415,7 @@ inline void nmk16_state::nmk16_draw_sprite(bitmap_ind16 &bitmap, const rectangle xx = w; do { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flip_screen(), flip_screen(), @@ -463,7 +463,7 @@ inline void nmk16_state::nmk16_draw_sprite_flipsupported(bitmap_ind16 &bitmap, c xx = w; do { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, @@ -592,7 +592,7 @@ int nmk16_state::nmk16_bioshipbg_sprflip_tx_update(screen_device &screen, bitmap int numtile = data&0xfff; int color = (data&0xf000)>>12; - m_gfxdecode->gfx(3)->opaque(m_palette,*m_background_bitmap,m_background_bitmap->cliprect(), + m_gfxdecode->gfx(3)->opaque(*m_background_bitmap,m_background_bitmap->cliprect(), numtile, color, 0,0, /* no flip */ @@ -601,7 +601,7 @@ int nmk16_state::nmk16_bioshipbg_sprflip_tx_update(screen_device &screen, bitmap data = tilerom[offs+0x1000+bank]; numtile = data&0xfff; color = (data&0xf000)>>12; - m_gfxdecode->gfx(3)->opaque(m_palette,*m_background_bitmap,m_background_bitmap->cliprect(), + m_gfxdecode->gfx(3)->opaque(*m_background_bitmap,m_background_bitmap->cliprect(), numtile, color, 0,0, /* no flip */ diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c index 832f5cf8ab9..0b090150361 100644 --- a/src/mame/video/nova2001.c +++ b/src/mame/video/nova2001.c @@ -283,7 +283,7 @@ void nova2001_state::nova2001_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile, color, flipx, flipy, @@ -320,14 +320,14 @@ void nova2001_state::pkunwar_draw_sprites(bitmap_ind16 &bitmap, const rectangle flipy = !flipy; } - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile, color, flipx, flipy, sx, sy, 0); // there's no X MSB, so draw with wraparound (fixes title screen) - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tile, color, flipx, flipy, diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index bddcd69da8a..5323135eb1f 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -151,7 +151,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, pal, flipx,flipy, @@ -160,7 +160,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, pal, flipx,flipy, diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index 24252f33ed4..c57a181a4a8 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -89,7 +89,7 @@ void ohmygod_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec sy -= 65536; flipx = sr[offs + 3] & 0x8000; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,0, diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 6b72616ad28..7969cc1ecb2 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -123,7 +123,7 @@ void oneshot_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec for (blocky = 0; blocky < ysize; blocky++) { - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, num + (blocky * xsize) + blockx, @@ -132,7 +132,7 @@ void oneshot_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec xpos + blockx * 8, ypos + blocky * 8, 0); - gfx->transpen(m_palette, + gfx->transpen( bitmap, cliprect, num + (blocky * xsize) + blockx, diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index 5068262c027..b97a9b7bbf2 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(m_palette,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/othunder.c b/src/mame/video/othunder.c index dbfd9d23d72..34e086b2b29 100644 --- a/src/mame/video/othunder.c +++ b/src/mame/video/othunder.c @@ -164,7 +164,7 @@ void othunder_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, } else { - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, @@ -182,7 +182,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); { sprite_ptr--; - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c index bd20835d0eb..3ed38891898 100644 --- a/src/mame/video/pacland.c +++ b/src/mame/video/pacland.c @@ -311,13 +311,13 @@ void pacland_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co for (x = 0;x <= sizex;x++) { if (whichmask != 0) - m_gfxdecode->gfx(2)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transmask(bitmap,cliprect, sprite + gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)], color, flipx,flipy, sx + 16*x,sy + 16*y,m_transmask[whichmask][color]); else - m_gfxdecode->gfx(2)->prio_transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->prio_transmask(bitmap,cliprect, sprite + gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)], color, flipx,flipy, diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index 0cd8dd0b981..c9447c2d580 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -240,7 +240,7 @@ UINT32 pacman_state::screen_update_pacman(screen_device &screen, bitmap_ind16 &b color = ( spriteram[offs + 1] & 0x1f ) | (m_colortablebank << 5) | (m_palettebank << 6 ); - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,spriteclip, + m_gfxdecode->gfx(1)->transmask(bitmap,spriteclip, ( spriteram[offs] >> 2 ) | (m_spritebank << 6), color, fx,fy, @@ -248,7 +248,7 @@ UINT32 pacman_state::screen_update_pacman(screen_device &screen, bitmap_ind16 &b m_palette->transpen_mask(*m_gfxdecode->gfx(1), color & 0x3f, 0)); /* also plot the sprite with wraparound (tunnel in Crush Roller) */ - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,spriteclip, + m_gfxdecode->gfx(1)->transmask(bitmap,spriteclip, ( spriteram[offs] >> 2 ) | (m_spritebank << 6), color, fx,fy, @@ -278,7 +278,7 @@ UINT32 pacman_state::screen_update_pacman(screen_device &screen, bitmap_ind16 &b fx = (spriteram[offs] & 1) ^ m_inv_spr; fy = (spriteram[offs] & 2) ^ ((m_inv_spr) << 1); - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,spriteclip, + m_gfxdecode->gfx(1)->transmask(bitmap,spriteclip, ( spriteram[offs] >> 2 ) | (m_spritebank << 6), color, fx,fy, @@ -286,7 +286,7 @@ UINT32 pacman_state::screen_update_pacman(screen_device &screen, bitmap_ind16 &b m_palette->transpen_mask(*m_gfxdecode->gfx(1), color & 0x3f, 0)); /* also plot the sprite with wraparound (tunnel in Crush Roller) */ - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,spriteclip, + m_gfxdecode->gfx(1)->transmask(bitmap,spriteclip, ( spriteram[offs] >> 2 ) | (m_spritebank << 6), color, fy,fx, //FIXME: flipping bits are really supposed to be inverted here? @@ -407,7 +407,7 @@ UINT32 pacman_state::screen_update_s2650games(screen_device &screen, bitmap_ind1 color = spriteram[offs + 1] & 0x1f; /* TODO: ?? */ - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, (spriteram[offs] >> 2) | ((m_s2650_spriteram[offs] & 3) << 6), color, spriteram[offs] & 1,spriteram[offs] & 2, @@ -427,7 +427,7 @@ UINT32 pacman_state::screen_update_s2650games(screen_device &screen, bitmap_ind1 color = spriteram[offs + 1] & 0x1f; /* TODO: ?? */ - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, (spriteram[offs] >> 2) | ((m_s2650_spriteram[offs] & 3)<<6), color, spriteram[offs] & 1,spriteram[offs] & 2, diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c index f435f3f6537..1a92c3b14aa 100644 --- a/src/mame/video/pandoras.c +++ b/src/mame/video/pandoras.c @@ -155,7 +155,7 @@ void pandoras_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre int nflipx = sr[offs + 3] & 0x40; int nflipy = sr[offs + 3] & 0x80; - m_gfxdecode->gfx(0)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, sr[offs + 2], color, !nflipx,!nflipy, diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index f0e0fc8a21e..62c5248910c 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -199,20 +199,20 @@ void paradise_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre y = 0xf0 - y; flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code + (attr << 8), 0, flipx, flipy, x,y, 0xff ); /* wrap around x */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code + (attr << 8), 0, flipx, flipy, x - 256,y, 0xff ); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code + (attr << 8), 0, flipx, flipy, diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c index 877f6289b58..bd6c3d5a662 100644 --- a/src/mame/video/pbaction.c +++ b/src/mame/video/pbaction.c @@ -115,7 +115,7 @@ void pbaction_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipy = !flipy; } - m_gfxdecode->gfx((spriteram[offs] & 0x80) ? 3 : 2)->transpen(m_palette,bitmap,cliprect, /* normal or double size */ + m_gfxdecode->gfx((spriteram[offs] & 0x80) ? 3 : 2)->transpen(bitmap,cliprect, /* normal or double size */ spriteram[offs], spriteram[offs + 1] & 0x0f, flipx,flipy, diff --git a/src/mame/video/pc090oj.c b/src/mame/video/pc090oj.c index 86ea906e982..cdbd079cdad 100644 --- a/src/mame/video/pc090oj.c +++ b/src/mame/video/pc090oj.c @@ -241,7 +241,7 @@ void pc090oj_device::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre x += m_x_offset; y += m_y_offset; - m_gfxdecode->gfx(m_gfxnum)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfxnum)->prio_transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c index 791b2e84edd..74788effe38 100644 --- a/src/mame/video/pcktgal.c +++ b/src/mame/video/pcktgal.c @@ -54,7 +54,7 @@ void pcktgal_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect if (flipy) flipy=0; else flipy=1; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, spriteram[offs+3] + ((spriteram[offs+1] & 1) << 8), (spriteram[offs+1] & 0x70) >> 4, flipx,flipy, diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c index 26f07467339..fccc1be3c1c 100644 --- a/src/mame/video/pingpong.c +++ b/src/mame/video/pingpong.c @@ -130,7 +130,7 @@ void pingpong_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec color = spriteram[offs] & 0x1f; schar = spriteram[offs + 2] & 0x7f; - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,spritevisiblearea, + m_gfxdecode->gfx(1)->transmask(bitmap,spritevisiblearea, schar, color, flipx,flipy, diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c index a4e84a4022e..7eca3d7d167 100644 --- a/src/mame/video/pirates.c +++ b/src/mame/video/pirates.c @@ -89,7 +89,7 @@ void pirates_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ypos = 0xf2 - ypos; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index 63ffaaf8320..266eedbc434 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -194,7 +194,7 @@ void pitnrun_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, (spriteram[offs+1]&0x3f)+((spriteram[offs+2]&0x80)>>1)+((spriteram[offs+2]&0x40)<<1), pal, flipx,flipy, diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c index e0d7831def9..f823fc840d4 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(m_palette,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(m_palette,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(m_palette,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/playmark.c b/src/mame/video/playmark.c index 452c771e881..fa58cd6fe5c 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -430,7 +430,7 @@ void playmark_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, if(!pri && (color & 0x0c) == 0x0c) pri = 2; - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, code, color, flipx,0, @@ -468,7 +468,7 @@ void playmark_state::bigtwinb_draw_sprites( screen_device &screen, bitmap_ind16 code = spriteram[offs + 2] >> codeshift; color = ((spriteram[offs + 1] & 0xf000) >> 12); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,0, diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c index b098e2a6629..cfb8af5dfba 100644 --- a/src/mame/video/pokechmp.c +++ b/src/mame/video/pokechmp.c @@ -62,7 +62,7 @@ void pokechmp_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if (spriteram[offs+1] & 0x01) tileno += 0x100; if (spriteram[offs+1] & 0x08) tileno += 0x200; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tileno, (spriteram[offs+1] & 0xf0) >> 4, flipx,flipy, diff --git a/src/mame/video/polyplay.c b/src/mame/video/polyplay.c index 729c568cac1..d59addd4264 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(m_palette,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 b28c2342f6c..629d84212a4 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(m_palette,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/pooyan.c b/src/mame/video/pooyan.c index 3fae26d0367..06a48261b50 100644 --- a/src/mame/video/pooyan.c +++ b/src/mame/video/pooyan.c @@ -168,7 +168,7 @@ void pooyan_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect int flipy = spriteram_2[offs] & 0x80; - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index 5591f672acd..0a0d68e1d97 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -457,7 +457,7 @@ void popeye_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) sy = 496 - sy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code ^ 0x1ff, color, flipx,flipy, diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index 38e32c86154..b34217aef4d 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -208,7 +208,7 @@ void popper_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,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/portrait.c b/src/mame/video/portrait.c index 7f67565e0a3..c5ce2224f2c 100644 --- a/src/mame/video/portrait.c +++ b/src/mame/video/portrait.c @@ -171,7 +171,7 @@ void portrait_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tilenum,color, 0,fy, sx,sy,7); diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c index c14f407235c..a60e84c90d8 100644 --- a/src/mame/video/powerins.c +++ b/src/mame/video/powerins.c @@ -273,7 +273,7 @@ void powerins_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect { for (y = 0 ; y < dimy ; y++) { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index 3031ff9179b..48120d95a14 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(m_palette,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/psikyo.c b/src/mame/video/psikyo.c index 974cdaf9a1e..0b4246c39d0 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -341,7 +341,7 @@ void psikyo_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, co int addr = (code * 2) & (TILES_LEN - 1); if (zoomx == 32 && zoomy == 32) - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, TILES[addr+1] * 256 + TILES[addr], attr >> 8, flipx, flipy, @@ -349,7 +349,7 @@ void psikyo_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, co screen.priority(), pri[(attr & 0xc0) >> 6],trans_pen); else - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, TILES[addr+1] * 256 + TILES[addr], attr >> 8, flipx, flipy, @@ -460,7 +460,7 @@ void psikyo_state::draw_sprites_bootleg( screen_device &screen, bitmap_ind16 &bi int addr = (code * 2) & (TILES_LEN-1); if (zoomx == 32 && zoomy == 32) - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, TILES[addr+1] * 256 + TILES[addr], attr >> 8, flipx, flipy, @@ -468,7 +468,7 @@ void psikyo_state::draw_sprites_bootleg( screen_device &screen, bitmap_ind16 &bi screen.priority(), pri[(attr & 0xc0) >> 6],trans_pen); else - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, TILES[addr+1] * 256 + TILES[addr], attr >> 8, flipx, flipy, diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c index 4f42f0f28d1..90f5ee828d0 100644 --- a/src/mame/video/psikyo4.c +++ b/src/mame/video/psikyo4.c @@ -31,7 +31,7 @@ HgKairak: 86010000 1f201918 a0000000 Large Screen /* --- SPRITES --- */ -void psikyo4_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32 scr, palette_device& palette ) +void psikyo4_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32 scr) { /*- Sprite Format 0x0000 - 0x2bff -** @@ -112,7 +112,7 @@ void psikyo4_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec { for (i = xstart; i != xend; i += xinc) { - gfx->transpen(palette,bitmap,cliprect, tnum + loopnum, colr, flipx, flipy, xpos + 16 * i, ypos + 16 * j, 0); + gfx->transpen(bitmap,cliprect, tnum + loopnum, colr, flipx, flipy, xpos + 16 * i, ypos + 16 * j, 0); loopnum++; } } @@ -127,14 +127,16 @@ void psikyo4_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec UINT32 psikyo4_state::screen_update_psikyo4_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { bitmap.fill(0x800, cliprect); - draw_sprites(bitmap, cliprect, 0x0000, m_palette); + m_gfxdecode->gfx(0)->set_palette(m_palette); + draw_sprites(bitmap, cliprect, 0x0000); return 0; } UINT32 psikyo4_state::screen_update_psikyo4_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { bitmap.fill(0x800, cliprect); - draw_sprites(bitmap, cliprect, 0x2000, m_palette2); + m_gfxdecode->gfx(0)->set_palette(m_palette2); + draw_sprites(bitmap, cliprect, 0x2000); return 0; } diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c index ebd9c2f1ae5..14e160a45d3 100644 --- a/src/mame/video/psikyosh.c +++ b/src/mame/video/psikyosh.c @@ -184,14 +184,14 @@ void psikyosh_state::draw_bglayer( int layer, bitmap_rgb32 &bitmap, const rectan tileno = (m_bgram[(tilebank * 0x800) / 4 + offs - 0x4000 / 4] & 0x0007ffff); /* seems to take into account spriteram, hence -0x4000 */ colour = (m_bgram[(tilebank * 0x800) / 4 + offs - 0x4000 / 4] & 0xff000000) >> 24; - gfx->alphatable(m_palette, bitmap, cliprect, tileno, colour, 0, 0, (16 * sx + scrollx) & 0x1ff, ((16 * sy + scrolly) & (width - 1)), alpha, m_alphatable); /* normal */ + gfx->alphatable(bitmap, cliprect, tileno, colour, 0, 0, (16 * sx + scrollx) & 0x1ff, ((16 * sy + scrolly) & (width - 1)), alpha, m_alphatable); /* normal */ if (scrollx) - gfx->alphatable(m_palette, bitmap, cliprect, tileno, colour, 0, 0, ((16 * sx + scrollx) & 0x1ff) - 0x200, ((16 * sy + scrolly) & (width - 1)), alpha, m_alphatable); /* wrap x */ + gfx->alphatable(bitmap, cliprect, tileno, colour, 0, 0, ((16 * sx + scrollx) & 0x1ff) - 0x200, ((16 * sy + scrolly) & (width - 1)), alpha, m_alphatable); /* wrap x */ if (scrolly) - gfx->alphatable(m_palette, bitmap, cliprect, tileno, colour, 0, 0, (16 * sx + scrollx) & 0x1ff, ((16 * sy + scrolly) & (width - 1)) - width, alpha, m_alphatable); /* wrap y */ + gfx->alphatable(bitmap, cliprect, tileno, colour, 0, 0, (16 * sx + scrollx) & 0x1ff, ((16 * sy + scrolly) & (width - 1)) - width, alpha, m_alphatable); /* wrap y */ if (scrollx && scrolly) - gfx->alphatable(m_palette, bitmap, cliprect, tileno, colour, 0, 0, ((16 * sx + scrollx) & 0x1ff) - 0x200, ((16 * sy + scrolly) & (width - 1)) - width, alpha, m_alphatable); /* wrap xy */ + gfx->alphatable(bitmap, cliprect, tileno, colour, 0, 0, ((16 * sx + scrollx) & 0x1ff) - 0x200, ((16 * sy + scrolly) & (width - 1)) - width, alpha, m_alphatable); /* wrap xy */ offs++; } @@ -232,7 +232,7 @@ void psikyosh_state::cache_bitmap(int scanline, gfx_element *gfx, int size, int int need_alpha = alpha < 0 ? -1 : 0xff; // store per-pen alpha in bitmap, otherwise don't since we'll need it per-line if(tileno) { // valid tile, but blank in all games? - gfx->alphastore(m_palette, m_bg_bitmap, m_bg_bitmap.cliprect(), tileno, colour, 0, 0, (16 * sx) & 0x1ff, ((16 * sy) & (width - 1)), need_alpha, m_alphatable); + gfx->alphastore(m_bg_bitmap, m_bg_bitmap.cliprect(), tileno, colour, 0, 0, (16 * sx) & 0x1ff, ((16 * sy) & (width - 1)), need_alpha, m_alphatable); } offs++; diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index b9e994e2163..297f1cd5249 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -106,7 +106,7 @@ void pushman_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, sprite, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite, color, flipx, flipy, x, y, 15); } } diff --git a/src/mame/video/quasar.c b/src/mame/video/quasar.c index 3f9f0dd1d26..a8ea4ac4318 100644 --- a/src/mame/video/quasar.c +++ b/src/mame/video/quasar.c @@ -121,7 +121,7 @@ UINT32 quasar_state::screen_update_quasar(screen_device &screen, bitmap_ind16 &b bitmap.pix16(y + oy, x + ox) = forecolor; /* Main Screen */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, m_color_ram[offs] & 0x3f, 0,0, @@ -131,7 +131,7 @@ UINT32 quasar_state::screen_update_quasar(screen_device &screen, bitmap_ind16 &b /* background for Collision Detection (it can only hit certain items) */ if((m_color_ram[offs] & 7) == 0) { - m_gfxdecode->gfx(0)->opaque(m_palette,m_collision_background,cliprect, + m_gfxdecode->gfx(0)->opaque(m_collision_background,cliprect, code, 64, 0,0, diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c index 3452d1d8ec1..71d7d0f1217 100644 --- a/src/mame/video/quizdna.c +++ b/src/mame/video/quizdna.c @@ -172,7 +172,7 @@ void quizdna_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect { y &= 0x1ff; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code ^ i, col, fx,fy, diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c index 5ff92ed97cd..bb385c8c3a3 100644 --- a/src/mame/video/raiden.c +++ b/src/mame/video/raiden.c @@ -133,7 +133,7 @@ void raiden_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, flipx = !flipx; } - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, x, y, 15); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 15); } } diff --git a/src/mame/video/rainbow.c b/src/mame/video/rainbow.c index 76f943bbc9b..d95c90cbdbd 100644 --- a/src/mame/video/rainbow.c +++ b/src/mame/video/rainbow.c @@ -113,7 +113,7 @@ UINT32 rbisland_state::screen_update_jumping(screen_device &screen, bitmap_ind16 data1 = spriteram[offs + 3]; color = (spriteram[offs + 4] & 0x0f) | sprite_colbank; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile, color, data1 & 0x40, data1 & 0x80, diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c index 1b398c03b8a..d30e66af4c6 100644 --- a/src/mame/video/rallyx.c +++ b/src/mame/video/rallyx.c @@ -455,7 +455,7 @@ void rallyx_state::rallyx_draw_sprites( screen_device &screen, bitmap_ind16 &bit if (flip_screen()) sx -= 2 * displacement; - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, (spriteram[offs] & 0xfc) >> 2, color, flipx,flipy, @@ -478,7 +478,7 @@ void rallyx_state::locomotn_draw_sprites( screen_device &screen, bitmap_ind16 &b int color = spriteram_2[offs + 1] & 0x3f; int flip = spriteram[offs] & 2; - m_gfxdecode->gfx(1)->prio_transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, ((spriteram[offs] & 0x7c) >> 2) + 0x20*(spriteram[offs] & 0x01) + ((spriteram[offs] & 0x80) >> 1), color, flip,flip, @@ -502,19 +502,19 @@ void rallyx_state::rallyx_draw_bullets( bitmap_ind16 &bitmap, const rectangle &c x -= 3; if (transpen) - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, ((m_radarattr[offs & 0x0f] & 0x0e) >> 1) ^ 0x07, 0, 0,0, x,y, 3); else - m_gfxdecode->gfx(2)->transtable(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transtable(bitmap,cliprect, ((m_radarattr[offs & 0x0f] & 0x0e) >> 1) ^ 0x07, 0, 0,0, x,y, - m_drawmode_table,m_palette->shadow_table()); + m_drawmode_table); } } @@ -530,19 +530,19 @@ void rallyx_state::jungler_draw_bullets( bitmap_ind16 &bitmap, const rectangle & y = 253 - m_radary[offs]; if (transpen) - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, (m_radarattr[offs & 0x0f] & 0x07) ^ 0x07, 0, 0,0, x,y, 3); else - m_gfxdecode->gfx(2)->transtable(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transtable(bitmap,cliprect, (m_radarattr[offs & 0x0f] & 0x07) ^ 0x07, 0, 0,0, x,y, - m_drawmode_table,m_palette->shadow_table()); + m_drawmode_table); } } @@ -566,19 +566,19 @@ void rallyx_state::locomotn_draw_bullets( bitmap_ind16 &bitmap, const rectangle y = 252 - m_radary[offs]; if (transpen) - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, (m_radarattr[offs & 0x0f] & 0x07) ^ 0x07, 0, 0,0, x,y, 3); else - m_gfxdecode->gfx(2)->transtable(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transtable(bitmap,cliprect, (m_radarattr[offs & 0x0f] & 0x07) ^ 0x07, 0, 0,0, x,y, - m_drawmode_table,m_palette->shadow_table()); + m_drawmode_table); } } diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index 2c7d10908e8..3c793ac1c6e 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -285,7 +285,7 @@ void realbrk_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) { m_tmpbitmap0->fill(0, spritetile_clip ); m_tmpbitmap1->fill(0, spritetile_clip ); - m_gfxdecode->gfx(gfx)->zoom_transpen(m_palette,*m_tmpbitmap0,spritetile_clip, + m_gfxdecode->gfx(gfx)->zoom_transpen(*m_tmpbitmap0,spritetile_clip, code++, color, flipx, flipy, @@ -347,7 +347,7 @@ void realbrk_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) break; default: - m_gfxdecode->gfx(gfx)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx)->zoom_transpen(bitmap,cliprect, code++, color, flipx, flipy, @@ -428,7 +428,7 @@ void realbrk_state::dai2kaku_draw_sprites(bitmap_ind16 &bitmap,const rectangle & int scalex = (sx + (x + 1) * xdim) / 0x10000 - currx; int scaley = (sy + (y + 1) * ydim) / 0x10000 - curry; - m_gfxdecode->gfx(gfx)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx)->zoom_transpen(bitmap,cliprect, code++, color, flipx, flipy, diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index e1bc175910d..5b9931b9ddf 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -193,13 +193,13 @@ void ladybug_state::redclash_draw_sprites( bitmap_ind16 &bitmap, const rectangle { int code = ((spriteram[offs + i + 1] & 0xf0) >> 4) + ((m_gfxbank & 1) << 4); - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, 0,0, sx,sy - 16,0); /* wraparound */ - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, 0,0, @@ -213,7 +213,7 @@ void ladybug_state::redclash_draw_sprites( bitmap_ind16 &bitmap, const rectangle int code = ((spriteram[offs + i + 1] & 0xf8) >> 3) + ((m_gfxbank & 1) << 5); int bank = (spriteram[offs + i + 1] & 0x02) >> 1; - m_gfxdecode->gfx(4+bank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4+bank)->transpen(bitmap,cliprect, code, color, 0,0, @@ -223,7 +223,7 @@ void ladybug_state::redclash_draw_sprites( bitmap_ind16 &bitmap, const rectangle { int code = ((spriteram[offs + i + 1] & 0xf0) >> 4) + ((m_gfxbank & 1) << 4); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, 0,0, @@ -232,7 +232,7 @@ void ladybug_state::redclash_draw_sprites( bitmap_ind16 &bitmap, const rectangle break; case 1: /* 8x8 */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, spriteram[offs + i + 1],// + 4 * (spriteram[offs + i + 2] & 0x10), color, 0,0, diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c index 55570402319..61f439e5a27 100644 --- a/src/mame/video/renegade.c +++ b/src/mame/video/renegade.c @@ -101,7 +101,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_bank)->transpen(bitmap,cliprect, sprite_number + 1, color, xflip, flip_screen(), @@ -111,7 +111,7 @@ void renegade_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { sy += (flip_screen() ? -16 : 16); } - m_gfxdecode->gfx(sprite_bank)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_bank)->transpen(bitmap,cliprect, sprite_number, color, xflip, flip_screen(), diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c index ce545a7cf22..d16b8f0d220 100644 --- a/src/mame/video/retofinv.c +++ b/src/mame/video/retofinv.c @@ -201,7 +201,7 @@ void retofinv_state::draw_sprites(bitmap_ind16 &bitmap) { for (x = 0;x <= sizex;x++) { - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,spritevisiblearea, + m_gfxdecode->gfx(1)->transmask(bitmap,spritevisiblearea, sprite + gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)], color, flipx,flipy, diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c index d6fb349c279..3eb6a48a33d 100644 --- a/src/mame/video/rocnrope.c +++ b/src/mame/video/rocnrope.c @@ -126,7 +126,7 @@ void rocnrope_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { int color = spriteram_2[offs] & 0x0f; - m_gfxdecode->gfx(0)->transmask(m_palette,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/rollrace.c b/src/mame/video/rollrace.c index fb81695cc22..43e53d60bb3 100644 --- a/src/mame/video/rollrace.c +++ b/src/mame/video/rollrace.c @@ -123,7 +123,7 @@ UINT32 rollrace_state::screen_update_rollrace(screen_device &screen, bitmap_ind1 if(m_ra_flipy) sy = 31-sy ; - m_gfxdecode->gfx(RA_BGCHAR_BASE)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(RA_BGCHAR_BASE)->transpen(bitmap, cliprect, mem[offs + ( m_ra_bkgpage * 1024 )] + ((( mem[offs + 0x4000 + ( m_ra_bkgpage * 1024 )] & 0xc0 ) >> 6 ) * 256 ) , @@ -161,7 +161,7 @@ UINT32 rollrace_state::screen_update_rollrace(screen_device &screen, bitmap_ind1 if(bank) bank += m_ra_spritebank; - m_gfxdecode->gfx( RA_SP_BASE + bank )->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx( RA_SP_BASE + bank )->transpen(bitmap,cliprect, spriteram[offs+1] & 0x3f , spriteram[offs+2] & 0x1f, m_ra_flipx,!(s_flipy^m_ra_flipy), @@ -188,7 +188,7 @@ UINT32 rollrace_state::screen_update_rollrace(screen_device &screen, bitmap_ind1 if (m_ra_flipx) sx = 31 - sx; - m_gfxdecode->gfx(RA_FGCHAR_BASE + m_ra_chrbank) ->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(RA_FGCHAR_BASE + m_ra_chrbank) ->transpen(bitmap,cliprect, m_videoram[ offs ] , col, m_ra_flipx,m_ra_flipy, diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c index 5545dd420ec..293e701e852 100644 --- a/src/mame/video/rpunch.c +++ b/src/mame/video/rpunch.c @@ -216,7 +216,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(m_palette,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 4ff4f523e1d..75284fa3580 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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, x, 240 - y, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, 0, flipx, flipy, x, 240 - y, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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 4a3d9161c99..2a484a41657 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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, @@ -199,7 +199,7 @@ void sauro_state::trckydoc_draw_sprites(bitmap_ind16 &bitmap, const rectangle &c sy = 240 - sy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index ab694b9dae0..80597a553f5 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -155,7 +155,7 @@ void sbasketb_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/scn2674.c b/src/mame/video/scn2674.c index e8d304965df..3466f4027fc 100644 --- a/src/mame/video/scn2674.c +++ b/src/mame/video/scn2674.c @@ -740,7 +740,7 @@ void scn2674_device::scn2574_draw_common( running_machine &machine, _BitmapClass attr = tiledat >>12; if (attr) - m_gfxdecode->gfx(gfxregion)->opaque(m_palette,bitmap,cliprect,tiledat,0,0,0,(x*8),(y*8)); + m_gfxdecode->gfx(gfxregion)->opaque(bitmap,cliprect,tiledat,0,0,0,(x*8),(y*8)); } if (dbl_size&2) diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c index 6c6040fabb4..83d0f5d36ee 100644 --- a/src/mame/video/scotrsht.c +++ b/src/mame/video/scotrsht.c @@ -111,7 +111,7 @@ void scotrsht_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, code, color, flipx, flipy, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, m_palette_bank * 16)); } diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c index 31de9fc1344..86a38993ee8 100644 --- a/src/mame/video/sderby.c +++ b/src/mame/video/sderby.c @@ -76,7 +76,7 @@ void sderby_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,i code = spriteram16[offs+2] >> codeshift; color = (spriteram16[offs+1] & 0x3e00) >> 9; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color/colordiv+48, flipx,0, diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index 72516ec2e37..f263e0dd06e 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(m_palette,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/seicross.c b/src/mame/video/seicross.c index 2f6050bfa98..c1a88268f13 100644 --- a/src/mame/video/seicross.c +++ b/src/mame/video/seicross.c @@ -101,13 +101,13 @@ void seicross_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec for (offs = m_spriteram.bytes() - 4; offs >= 0; offs -= 4) { int x = spriteram[offs + 3]; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (spriteram[offs] & 0x3f) + ((spriteram[offs + 1] & 0x10) << 2) + 128, spriteram[offs + 1] & 0x0f, spriteram[offs] & 0x40,spriteram[offs] & 0x80, x,240-spriteram[offs + 2],0); if(x>0xf0) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (spriteram[offs] & 0x3f) + ((spriteram[offs + 1] & 0x10) << 2) + 128, spriteram[offs + 1] & 0x0f, spriteram[offs] & 0x40,spriteram[offs] & 0x80, @@ -117,13 +117,13 @@ void seicross_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec for (offs = m_spriteram2.bytes() - 4; offs >= 0; offs -= 4) { int x = spriteram_2[offs + 3]; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (spriteram_2[offs] & 0x3f) + ((spriteram_2[offs + 1] & 0x10) << 2), spriteram_2[offs + 1] & 0x0f, spriteram_2[offs] & 0x40,spriteram_2[offs] & 0x80, x,240-spriteram_2[offs + 2],0); if(x>0xf0) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (spriteram_2[offs] & 0x3f) + ((spriteram_2[offs + 1] & 0x10) << 2), spriteram_2[offs + 1] & 0x0f, spriteram_2[offs] & 0x40,spriteram_2[offs] & 0x80, diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c index 033c4188db0..350175d8f79 100644 --- a/src/mame/video/senjyo.c +++ b/src/mame/video/senjyo.c @@ -252,7 +252,7 @@ void senjyo_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,i } - m_gfxdecode->gfx(big ? 5 : 4)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(big ? 5 : 4)->transpen(bitmap,cliprect, spriteram[offs], spriteram[offs + 1] & 0x07, flipx,flipy, diff --git a/src/mame/video/seta001.c b/src/mame/video/seta001.c index df783f58aee..b30264920f6 100644 --- a/src/mame/video/seta001.c +++ b/src/mame/video/seta001.c @@ -298,28 +298,28 @@ void seta001_device::draw_background( bitmap_ind16 &bitmap, const rectangle &cli color = ( color >> (16-5) ) % total_color_codes; code &= 0x3fff; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, ((sx) & 0x1ff),((sy) & 0x0ff), transpen); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, ((sx) & 0x1ff)-512,((sy) & 0x0ff), transpen); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, ((sx) & 0x1ff),((sy) & 0x0ff)-256, transpen); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -387,7 +387,7 @@ void seta001_device::draw_foreground( screen_device &screen, bitmap_ind16 &bitma flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -395,7 +395,7 @@ void seta001_device::draw_foreground( screen_device &screen, bitmap_ind16 &bitma max_y - ((sy + yoffs) & 0x0ff),m_transpen); /* wrap around x */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -403,7 +403,7 @@ void seta001_device::draw_foreground( screen_device &screen, bitmap_ind16 &bitma max_y - ((sy + yoffs) & 0x0ff),m_transpen); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -411,7 +411,7 @@ void seta001_device::draw_foreground( screen_device &screen, bitmap_ind16 &bitma max_y - ((sy + yoffs) & 0x0ff)-256,m_transpen); /* wrap around x */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index c5b1ccbd92d..4624af83c4b 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -161,25 +161,25 @@ void sf_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ) t = c2; c2 = c4; c4 = t; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c1), color, flipx,flipy, sx,sy, 15); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c2), color, flipx,flipy, sx+16,sy, 15); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c3), color, flipx,flipy, sx,sy+16, 15); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c4), color, @@ -196,7 +196,7 @@ void sf_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ) flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, sf_invert(c), color, diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c index e5b0461f929..8a6910bb0f0 100644 --- a/src/mame/video/shadfrce.c +++ b/src/mame/video/shadfrce.c @@ -129,10 +129,10 @@ void shadfrce_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c height++; if (enable) { for (hcount=0;hcount<height;hcount++) { - gfx->prio_transpen(m_palette,bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos,ypos-hcount*16-16,screen.priority(),pri_mask,0); - gfx->prio_transpen(m_palette,bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos-0x200,ypos-hcount*16-16,screen.priority(),pri_mask,0); - gfx->prio_transpen(m_palette,bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos,ypos-hcount*16-16+0x200,screen.priority(),pri_mask,0); - gfx->prio_transpen(m_palette,bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos-0x200,ypos-hcount*16-16+0x200,screen.priority(),pri_mask,0); + gfx->prio_transpen(bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos,ypos-hcount*16-16,screen.priority(),pri_mask,0); + gfx->prio_transpen(bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos-0x200,ypos-hcount*16-16,screen.priority(),pri_mask,0); + gfx->prio_transpen(bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos,ypos-hcount*16-16+0x200,screen.priority(),pri_mask,0); + gfx->prio_transpen(bitmap,cliprect,tile+hcount,pal,flipx,flipy,xpos-0x200,ypos-hcount*16-16+0x200,screen.priority(),pri_mask,0); } } source-=8; diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c index 27cb22a2777..8f02aaac761 100644 --- a/src/mame/video/shangha3.c +++ b/src/mame/video/shangha3.c @@ -206,7 +206,7 @@ WRITE16_MEMBER(shangha3_state::shangha3_blitter_go_w) if (flipy) dy = sy + sizey-15 - dy; else dy = sy + dy; - m_gfxdecode->gfx(0)->transpen(m_palette,rawbitmap,myclip, + m_gfxdecode->gfx(0)->transpen(rawbitmap,myclip, (tile & 0x0fff) | (code & 0xf000), (tile >> 12) | (color & 0x70), flipx,flipy, @@ -219,26 +219,26 @@ WRITE16_MEMBER(shangha3_state::shangha3_blitter_go_w) int w; if (zoomx <= 1 && zoomy <= 1) - m_gfxdecode->gfx(0)->zoom_transtable(m_palette,rawbitmap,myclip, + m_gfxdecode->gfx(0)->zoom_transtable(rawbitmap,myclip, code, color, flipx,flipy, sx,sy, 0x1000000,0x1000000, - drawmode_table,m_palette->shadow_table()); + drawmode_table); else { w = (sizex+15)/16; for (x = 0;x < w;x++) { - m_gfxdecode->gfx(0)->zoom_transtable(m_palette,rawbitmap,myclip, + m_gfxdecode->gfx(0)->zoom_transtable(rawbitmap,myclip, code, color, flipx,flipy, sx + 16*x,sy, (0x200-zoomx)*0x100,(0x200-zoomy)*0x100, - drawmode_table,m_palette->shadow_table()); + drawmode_table); if ((code & 0x000f) == 0x0f) code = (code + 0x100) & 0xfff0; diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index 5b02af543be..8aef4e440aa 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -142,7 +142,7 @@ void shangkid_state::draw_sprite(const UINT8 *source, bitmap_ind16 &bitmap, cons sx = xpos+(c^xflip)*width; sy = ypos+(r^yflip)*height; - gfx->zoom_transpen(m_palette, + gfx->zoom_transpen( bitmap, cliprect, tile+c*8+r, @@ -153,7 +153,7 @@ void shangkid_state::draw_sprite(const UINT8 *source, bitmap_ind16 &bitmap, cons // wrap around y - gfx->zoom_transpen(m_palette, + gfx->zoom_transpen( bitmap, cliprect, tile+c*8+r, @@ -265,7 +265,7 @@ void shangkid_state::dynamski_draw_background(bitmap_ind16 &bitmap, const rectan { tile += ((attr>>5)&0x3)*256; - m_gfxdecode->gfx(0)->transpen(m_palette, + m_gfxdecode->gfx(0)->transpen( bitmap, cliprect, tile, @@ -298,7 +298,7 @@ void shangkid_state::dynamski_draw_sprites(bitmap_ind16 &bitmap, const rectangle if( attr&1 ) sx += 0x100; - m_gfxdecode->gfx(1)->transpen(m_palette, + m_gfxdecode->gfx(1)->transpen( bitmap, cliprect, bank*0x40 + (tile&0x3f), diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c index 9e9a6dd5eeb..c7f3d76e900 100644 --- a/src/mame/video/shaolins.c +++ b/src/mame/video/shaolins.c @@ -168,7 +168,7 @@ void shaolins_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy, diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index 26ff8eeaf61..8c6c27a285e 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -129,7 +129,7 @@ void shootout_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c vy = 240 - vy; } - gfx->prio_transpen(m_palette,bitmap,cliprect, + gfx->prio_transpen(bitmap,cliprect, number, 0 /*color*/, flipx,flipy, @@ -148,7 +148,7 @@ void shootout_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c vy = 240 - vy; } - gfx->prio_transpen(m_palette,bitmap,cliprect, + gfx->prio_transpen(bitmap,cliprect, number, 0 /*color*/, flipx,flipy, diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 5b9a3963ab7..7c224e7bd05 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -186,7 +186,7 @@ void sidearms_state::draw_sprites_region(bitmap_ind16 &bitmap, const rectangle & } - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, x, y, 15); diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c index 1c693b829f6..db41db55584 100644 --- a/src/mame/video/sidepckt.c +++ b/src/mame/video/sidepckt.c @@ -129,13 +129,13 @@ void sidepckt_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect flipx = spriteram[offs+1] & 0x08; flipy = spriteram[offs+1] & 0x04; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, sx,sy,0); /* wraparound */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index c78190a822d..5353565e73d 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -36,14 +36,14 @@ void silkroad_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c { for (wcount=0;wcount<width;wcount++) { - gfx->prio_transpen(m_palette,bitmap,cliprect,tileno+wcount,color,0,0,xpos+wcount*16+8,ypos,screen.priority(),pri_mask,0); + gfx->prio_transpen(bitmap,cliprect,tileno+wcount,color,0,0,xpos+wcount*16+8,ypos,screen.priority(),pri_mask,0); } } else { for (wcount=width;wcount>0;wcount--) { - gfx->prio_transpen(m_palette,bitmap,cliprect,tileno+(width-wcount),color,1,0,xpos+wcount*16-16+8,ypos,screen.priority(),pri_mask,0); + gfx->prio_transpen(bitmap,cliprect,tileno+(width-wcount),color,1,0,xpos+wcount*16-16+8,ypos,screen.priority(),pri_mask,0); } } diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c index b83c7a9036f..f7aa6366a45 100644 --- a/src/mame/video/skydiver.c +++ b/src/mame/video/skydiver.c @@ -190,7 +190,7 @@ void skydiver_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec sx -= 8; } - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->zoom_transpen(bitmap,cliprect, charcode, color, xflip,yflip,sx,sy, wide ? 0x20000 : 0x10000, 0x10000,0); diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c index 14f4672dbc4..09260321908 100644 --- a/src/mame/video/skyfox.c +++ b/src/mame/video/skyfox.c @@ -191,7 +191,7 @@ void skyfox_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect } #define DRAW_SPRITE(DX,DY,CODE) \ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,\ + m_gfxdecode->gfx(0)->transpen(bitmap,\ cliprect, \ (CODE), \ 0, \ diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c index 0f6cbf4ab05..aec5cf1b4c8 100644 --- a/src/mame/video/skykid.c +++ b/src/mame/video/skykid.c @@ -211,7 +211,7 @@ void skykid_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) { for (x = 0;x <= sizex;x++) { - m_gfxdecode->gfx(2)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transmask(bitmap,cliprect, sprite + gfx_offs[y ^ (sizey * flipy)][x ^ (sizex * flipx)], color, flipx,flipy, diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c index 69cdb10160a..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(m_palette,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(m_palette,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code ^ 15, 0, 0, 0, horz / 2, vert, 0); } diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c index 09041fe24c3..bdd159b363c 100644 --- a/src/mame/video/slapfght.c +++ b/src/mame/video/slapfght.c @@ -160,7 +160,7 @@ void slapfght_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec sx = buffered_spriteram[offs+1] + 3; sy = buffered_spriteram[offs+3] - 1; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, buffered_spriteram[offs], ((buffered_spriteram[offs+2] >> 1) & 3) | ((buffered_spriteram[offs+2] << 2) & 4) | (m_slapfight_palette_bank << 3), @@ -217,13 +217,13 @@ UINT32 slapfght_state::screen_update_slapfight(screen_device &screen, bitmap_ind for (offs = 0;offs < m_spriteram->bytes();offs += 4) { if (m_flipscreen) - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, buffered_spriteram[offs] + ((buffered_spriteram[offs+2] & 0xc0) << 2), (buffered_spriteram[offs+2] & 0x1e) >> 1, 1,1, 288-(buffered_spriteram[offs+1] + ((buffered_spriteram[offs+2] & 0x01) << 8)) +18,240-buffered_spriteram[offs+3],0); else - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, buffered_spriteram[offs] + ((buffered_spriteram[offs+2] & 0xc0) << 2), (buffered_spriteram[offs+2] & 0x1e) >> 1, 0,0, diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c index b9a98bead7f..bbb48181383 100644 --- a/src/mame/video/slapshot.c +++ b/src/mame/video/slapshot.c @@ -347,7 +347,7 @@ void slapshot_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, } else { - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, @@ -363,7 +363,7 @@ void slapshot_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, { sprite_ptr--; - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c index f3098abb88d..98bf6c428af 100644 --- a/src/mame/video/snk.c +++ b/src/mame/video/snk.c @@ -691,12 +691,12 @@ static void marvins_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, if (sx > 512-16) sx -= 512; if (sy > 256-16) sy -= 256; - gfx->transtable(state->m_palette,bitmap,cliprect, + gfx->transtable(bitmap,cliprect, tile_number, color, flipx, flipy, sx, sy, - state->m_drawmode_table, state->m_palette->shadow_table()); + state->m_drawmode_table); source+=4; } @@ -757,12 +757,12 @@ void snk_state::tnk3_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if (sx > 512-size) sx -= 512; if (sy > (m_yscroll_mask+1)-size) sy -= (m_yscroll_mask+1); - gfx->transtable(m_palette,bitmap,cliprect, + gfx->transtable(bitmap,cliprect, tile_number, color, xflip,yflip, sx,sy, - m_drawmode_table, m_palette->shadow_table()); + m_drawmode_table); } } @@ -804,12 +804,12 @@ static void ikari_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, c if (sx > 512-size) sx -= 512; if (sy > 512-size) sy -= 512; - gfx->transtable(state->m_palette,bitmap,cliprect, + gfx->transtable(bitmap,cliprect, tile_number, color, 0,0, sx,sy, - state->m_drawmode_table, state->m_palette->shadow_table()); + state->m_drawmode_table); } } @@ -892,12 +892,12 @@ static void tdfever_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, if (sx > 512-size) sx -= 512; if (sy > 512-size) sy -= 512; - gfx->transtable(state->m_palette,bitmap,cliprect, + gfx->transtable(bitmap,cliprect, tile_number, color, flipx,flipy, sx,sy, - state->m_drawmode_table, state->m_palette->shadow_table()); + state->m_drawmode_table); } } diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index 5491a106252..b7d073fe281 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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tile, color, fx, fy, diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index f51001aa215..4d70f21ef1c 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -87,7 +87,7 @@ void solomon_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index ba0335880e4..8d21a933ad6 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -155,14 +155,14 @@ void sonson_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); /* wrap-around */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx - 256, sy, 0); - m_gfxdecode->gfx(1)->transpen(m_palette,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/spcforce.c b/src/mame/video/spcforce.c index 229cf189f76..05f7c3e35db 100644 --- a/src/mame/video/spcforce.c +++ b/src/mame/video/spcforce.c @@ -39,7 +39,7 @@ UINT32 spcforce_state::screen_update_spcforce(screen_device &screen, bitmap_ind1 sy = 248 - sy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, col, flip, flip, sx, sy,0); diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c index 81856407163..80c9ec84cfe 100644 --- a/src/mame/video/spdodgeb.c +++ b/src/mame/video/spdodgeb.c @@ -140,7 +140,7 @@ WRITE8_MEMBER(spdodgeb_state::spdodgeb_videoram_w) ***************************************************************************/ -#define DRAW_SPRITE( order, sx, sy ) gfx->transpen(m_palette,bitmap,\ +#define DRAW_SPRITE( order, sx, sy ) gfx->transpen(bitmap,\ cliprect, \ (which+order),color+ 8 * m_sprite_palbank,flipx,flipy,sx,sy,0); diff --git a/src/mame/video/speedatk.c b/src/mame/video/speedatk.c index 33a5272f122..bd51334d9e9 100644 --- a/src/mame/video/speedatk.c +++ b/src/mame/video/speedatk.c @@ -99,7 +99,7 @@ UINT32 speedatk_state::screen_update_speedatk(screen_device &screen, bitmap_ind1 color = m_colorram[count] & 0x1f; region = (m_colorram[count] & 0x10) >> 4; - m_gfxdecode->gfx(region)->opaque(m_palette,bitmap,cliprect,tile,color,m_flip_scr,m_flip_scr,x*8,y*8); + m_gfxdecode->gfx(region)->opaque(bitmap,cliprect,tile,color,m_flip_scr,m_flip_scr,x*8,y*8); count = (m_flip_scr) ? count-1 : count+1; count&=0x3ff; diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c index 9518b6b510d..169114743b0 100644 --- a/src/mame/video/speedbal.c +++ b/src/mame/video/speedbal.c @@ -107,7 +107,7 @@ void speedbal_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipx = flipy = 1; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c index e0d7fa412f0..7b5de0be6a0 100644 --- a/src/mame/video/speedspn.c +++ b/src/mame/video/speedspn.c @@ -74,7 +74,7 @@ void speedspn_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec tileno += ((attr & 0xe0) >> 5) * 0x100; color = attr & 0x0f; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, tileno, color, 0,0, diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c index a31428220cc..a3a9bd43df5 100644 --- a/src/mame/video/splash.c +++ b/src/mame/video/splash.c @@ -215,7 +215,7 @@ void splash_state::splash_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cli if (attr2 & 0x80) sx += 256; - gfx->transpen(m_palette,bitmap,cliprect,number, + gfx->transpen(bitmap,cliprect,number, 0x10 + (attr2 & 0x0f),attr & 0x40,attr & 0x80, sx-8,sy,0); } @@ -235,7 +235,7 @@ void splash_state::funystrp_draw_sprites(bitmap_ind16 &bitmap,const rectangle &c if (attr2 & 0x80) sx += 256; - gfx->transpen(m_palette,bitmap,cliprect,number, + gfx->transpen(bitmap,cliprect,number, (attr2 & 0x7f),attr & 0x40,attr & 0x80, sx-8,sy,0); } diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c index 7cd3013d623..e592f00e6a8 100644 --- a/src/mame/video/sprcros2.c +++ b/src/mame/video/sprcros2.c @@ -166,7 +166,7 @@ void sprcros2_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, m_spriteram[offs], color, flipx,flipy, diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c index 5537d32b056..361659080f7 100644 --- a/src/mame/video/sprint2.c +++ b/src/mame/video/sprint2.c @@ -122,7 +122,7 @@ UINT32 sprint2_state::screen_update_sprint2(screen_device &screen, bitmap_ind16 for (i = 0; i < 4; i++) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, get_sprite_code(video_ram, i), i, 0, 0, @@ -166,7 +166,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_palette,m_helper,rect, + m_gfxdecode->gfx(1)->transpen(m_helper,rect, get_sprite_code(video_ram, i), 0, 0, 0, @@ -180,7 +180,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_palette,m_helper,rect, + m_gfxdecode->gfx(1)->transpen(m_helper,rect, get_sprite_code(video_ram, j), 1, 0, 0, @@ -188,7 +188,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_palette,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 bdf08372a90..4dd80b0a827 100644 --- a/src/mame/video/sprint4.c +++ b/src/mame/video/sprint4.c @@ -71,7 +71,7 @@ UINT32 sprint4_state::screen_update_sprint4(screen_device &screen, bitmap_ind16 if (i & 1) bank = 32; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (code >> 3) | bank, (attr & 0x80) ? 4 : i, 0, 0, @@ -117,7 +117,7 @@ void sprint4_state::screen_eof_sprint4(screen_device &screen, bool state) if (i & 1) bank = 32; - m_gfxdecode->gfx(1)->transpen(m_palette,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 2deb778a7b9..0437b1db487 100644 --- a/src/mame/video/sprint8.c +++ b/src/mame/video/sprint8.c @@ -135,7 +135,7 @@ void sprint8_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect if (code & 0x80) x |= 0x100; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code ^ 7, i, !(code & 0x10), !(code & 0x08), diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c index 99015d8f678..e321a620653 100644 --- a/src/mame/video/srumbler.c +++ b/src/mame/video/srumbler.c @@ -142,7 +142,7 @@ void srumbler_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, colour, flip_screen(),flipy, diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c index 5bc22c581bc..10a6a759b8b 100644 --- a/src/mame/video/sslam.c +++ b/src/mame/video/sslam.c @@ -39,28 +39,28 @@ void sslam_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) { if (flipx) { - gfx->transpen(m_palette,bitmap,cliprect,number, colr,1,0,xpos+8,ypos,0); - gfx->transpen(m_palette,bitmap,cliprect,number+1,colr,1,0,xpos+8,ypos+8,0); - gfx->transpen(m_palette,bitmap,cliprect,number+2,colr,1,0,xpos, ypos,0); - gfx->transpen(m_palette,bitmap,cliprect,number+3,colr,1,0,xpos, ypos+8,0); + gfx->transpen(bitmap,cliprect,number, colr,1,0,xpos+8,ypos,0); + gfx->transpen(bitmap,cliprect,number+1,colr,1,0,xpos+8,ypos+8,0); + gfx->transpen(bitmap,cliprect,number+2,colr,1,0,xpos, ypos,0); + gfx->transpen(bitmap,cliprect,number+3,colr,1,0,xpos, ypos+8,0); } else { - gfx->transpen(m_palette,bitmap,cliprect,number, colr,0,0,xpos, ypos,0); - gfx->transpen(m_palette,bitmap,cliprect,number+1,colr,0,0,xpos, ypos+8,0); - gfx->transpen(m_palette,bitmap,cliprect,number+2,colr,0,0,xpos+8,ypos,0); - gfx->transpen(m_palette,bitmap,cliprect,number+3,colr,0,0,xpos+8,ypos+8,0); + gfx->transpen(bitmap,cliprect,number, colr,0,0,xpos, ypos,0); + gfx->transpen(bitmap,cliprect,number+1,colr,0,0,xpos, ypos+8,0); + gfx->transpen(bitmap,cliprect,number+2,colr,0,0,xpos+8,ypos,0); + gfx->transpen(bitmap,cliprect,number+3,colr,0,0,xpos+8,ypos+8,0); } } else { if (flipx) { - gfx->transpen(m_palette,bitmap,cliprect,number ^ 2,colr,1,0,xpos,ypos,0); + gfx->transpen(bitmap,cliprect,number ^ 2,colr,1,0,xpos,ypos,0); } else { - gfx->transpen(m_palette,bitmap,cliprect,number,colr,0,0,xpos,ypos,0); + gfx->transpen(bitmap,cliprect,number,colr,0,0,xpos,ypos,0); } } diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index 3e0b5277106..67c38bd9eb7 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -161,7 +161,7 @@ void ssozumo_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c index c2a7b41f4e5..cb80cb799b9 100644 --- a/src/mame/video/sspeedr.c +++ b/src/mame/video/sspeedr.c @@ -197,7 +197,7 @@ void sspeedr_state::draw_drones(bitmap_ind16 &bitmap, const rectangle &cliprect) y = 0xf0 - m_drones_vert[i >> 1]; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code[i] ^ m_toggle, 0, 0, 0, @@ -227,7 +227,7 @@ void sspeedr_state::draw_driver(bitmap_ind16 &bitmap, const rectangle &cliprect) y = 0xf0 - m_driver_vert; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_driver_pic, 0, 0, 0, diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c index 8c6e6e7ce8d..91443bc80c2 100644 --- a/src/mame/video/ssrj.c +++ b/src/mame/video/ssrj.c @@ -246,7 +246,7 @@ void ssrj_state::draw_objects(bitmap_ind16 &bitmap, const rectangle &cliprect ) int offs = (i * 5 + k) * 64 + (31 - j) * 2; code = m_vram3[offs] + 256 * m_vram3[offs + 1]; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap, + m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, code&1023, ((code>>12)&0x3)+8, diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c index 18dcd5957a7..8940c3fee8b 100644 --- a/src/mame/video/st0016.c +++ b/src/mame/video/st0016.c @@ -509,7 +509,7 @@ void st0016_state::draw_bgmap(bitmap_ind16 &bitmap,const rectangle &cliprect, in if(priority) { - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/st0020.c b/src/mame/video/st0020.c index 5918490de0b..03941d5fc12 100644 --- a/src/mame/video/st0020.c +++ b/src/mame/video/st0020.c @@ -393,7 +393,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(m_gfx_index)->zoom_transpen(bitmap,cliprect, code++, color, flipx, flipy, diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c index f886e9f21fe..39b5ffcb0dc 100644 --- a/src/mame/video/starcrus.c +++ b/src/mame/video/starcrus.c @@ -165,7 +165,7 @@ int starcrus_state::collision_check_s1s2() /* Draw ship 1 */ - m_gfxdecode->gfx(8+((m_s1_sprite&0x04)>>2))->opaque(m_palette,*m_ship1_vid, + m_gfxdecode->gfx(8+((m_s1_sprite&0x04)>>2))->opaque(*m_ship1_vid, clip, (m_s1_sprite&0x03)^0x03, 0, @@ -174,7 +174,7 @@ int starcrus_state::collision_check_s1s2() /* Draw ship 2 */ - m_gfxdecode->gfx(10+((m_s2_sprite&0x04)>>2))->opaque(m_palette,*m_ship2_vid, + m_gfxdecode->gfx(10+((m_s2_sprite&0x04)>>2))->opaque(*m_ship2_vid, clip, (m_s2_sprite&0x03)^0x03, 0, @@ -216,7 +216,7 @@ int starcrus_state::collision_check_p1p2() { /* Draw score/projectile 1 */ - m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->opaque(m_palette,*m_proj1_vid, + m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->opaque(*m_proj1_vid, clip, (m_p1_sprite&0x03)^0x03, 0, @@ -228,7 +228,7 @@ int starcrus_state::collision_check_p1p2() { /* Draw score/projectile 2 */ - m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->opaque(m_palette,*m_proj2_vid, + m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->opaque(*m_proj2_vid, clip, (m_p2_sprite&0x03)^0x03, 0, @@ -270,7 +270,7 @@ int starcrus_state::collision_check_s1p1p2() /* Draw ship 1 */ - m_gfxdecode->gfx(8+((m_s1_sprite&0x04)>>2))->opaque(m_palette,*m_ship1_vid, + m_gfxdecode->gfx(8+((m_s1_sprite&0x04)>>2))->opaque(*m_ship1_vid, clip, (m_s1_sprite&0x03)^0x03, 0, @@ -281,7 +281,7 @@ int starcrus_state::collision_check_s1p1p2() { /* Draw projectile 1 */ - m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->opaque(m_palette,*m_proj1_vid, + m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->opaque(*m_proj1_vid, clip, (m_p1_sprite&0x03)^0x03, 0, @@ -293,7 +293,7 @@ int starcrus_state::collision_check_s1p1p2() { /* Draw projectile 2 */ - m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->opaque(m_palette,*m_proj2_vid, + m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->opaque(*m_proj2_vid, clip, (m_p2_sprite&0x03)^0x03, 0, @@ -341,7 +341,7 @@ int starcrus_state::collision_check_s2p1p2() /* Draw ship 2 */ - m_gfxdecode->gfx(10+((m_s2_sprite&0x04)>>2))->opaque(m_palette,*m_ship2_vid, + m_gfxdecode->gfx(10+((m_s2_sprite&0x04)>>2))->opaque(*m_ship2_vid, clip, (m_s2_sprite&0x03)^0x03, 0, @@ -352,7 +352,7 @@ int starcrus_state::collision_check_s2p1p2() { /* Draw projectile 1 */ - m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->opaque(m_palette,*m_proj1_vid, + m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->opaque(*m_proj1_vid, clip, (m_p1_sprite&0x03)^0x03, 0, @@ -364,7 +364,7 @@ int starcrus_state::collision_check_s2p1p2() { /* Draw projectile 2 */ - m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->opaque(m_palette,*m_proj2_vid, + m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->opaque(*m_proj2_vid, clip, (m_p2_sprite&0x03)^0x03, 0, @@ -394,7 +394,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1 /* Draw ship 1 */ - m_gfxdecode->gfx(8+((m_s1_sprite&0x04)>>2))->transpen(m_palette,bitmap, + m_gfxdecode->gfx(8+((m_s1_sprite&0x04)>>2))->transpen(bitmap, cliprect, (m_s1_sprite&0x03)^0x03, 0, @@ -404,7 +404,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1 /* Draw ship 2 */ - m_gfxdecode->gfx(10+((m_s2_sprite&0x04)>>2))->transpen(m_palette,bitmap, + m_gfxdecode->gfx(10+((m_s2_sprite&0x04)>>2))->transpen(bitmap, cliprect, (m_s2_sprite&0x03)^0x03, 0, @@ -414,7 +414,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1 /* Draw score/projectile 1 */ - m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->transpen(m_palette,bitmap, + m_gfxdecode->gfx((m_p1_sprite&0x0c)>>2)->transpen(bitmap, cliprect, (m_p1_sprite&0x03)^0x03, 0, @@ -424,7 +424,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1 /* Draw score/projectile 2 */ - m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->transpen(m_palette,bitmap, + m_gfxdecode->gfx(4+((m_p2_sprite&0x0c)>>2))->transpen(bitmap, cliprect, (m_p2_sprite&0x03)^0x03, 0, diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c index 9acc7ca0419..51c3a5e49e3 100644 --- a/src/mame/video/starshp1.c +++ b/src/mame/video/starshp1.c @@ -180,7 +180,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code % 8, code / 8, 0, 0, @@ -206,7 +206,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(m_palette,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/stfight.c b/src/mame/video/stfight.c index 40f6933ed63..db3c09fceee 100644 --- a/src/mame/video/stfight.c +++ b/src/mame/video/stfight.c @@ -299,7 +299,7 @@ void stfight_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co code = m_sprite_base + m_sprite_ram[offs]; - m_gfxdecode->gfx(4)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(4)->prio_transpen(bitmap,cliprect, code, color, flipx,flip_screen(), @@ -348,10 +348,10 @@ void stfight_state::cshooter_draw_sprites(screen_device &screen, bitmap_ind16 &b tile_low += (tile_low > 0x9) ? 0x37 : 0x30; tile_high += (tile_high > 0x9) ? 0x37 : 0x30; - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, tile_high << 1, color, flipx, 0, m_sprite_ram[i+3],m_sprite_ram[i+2],screen.priority(),pri ? 0x02 : 0,0x00); - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, tile_high << 1, color, flipx, 0, m_sprite_ram[i+3]+8,m_sprite_ram[i+2],screen.priority(),pri ? 0x02 : 0,0x00); - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, tile_low << 1, color, flipx, 0, m_sprite_ram[i+3]+8,m_sprite_ram[i+2]+8,screen.priority(),pri ? 0x02 : 0,0x00); - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, tile_low << 1, color, flipx, 0, m_sprite_ram[i+3],m_sprite_ram[i+2]+8,screen.priority(),pri ? 0x02 : 0,0x00); + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, tile_high << 1, color, flipx, 0, m_sprite_ram[i+3],m_sprite_ram[i+2],screen.priority(),pri ? 0x02 : 0,0x00); + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, tile_high << 1, color, flipx, 0, m_sprite_ram[i+3]+8,m_sprite_ram[i+2],screen.priority(),pri ? 0x02 : 0,0x00); + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, tile_low << 1, color, flipx, 0, m_sprite_ram[i+3]+8,m_sprite_ram[i+2]+8,screen.priority(),pri ? 0x02 : 0,0x00); + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, tile_low << 1, color, flipx, 0, m_sprite_ram[i+3],m_sprite_ram[i+2]+8,screen.priority(),pri ? 0x02 : 0,0x00); } } diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index f1315bafee5..0dd2ffac9e0 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -106,7 +106,7 @@ void stlforce_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec ypos = 512-ypos; - gfx->transpen(m_palette,bitmap, + gfx->transpen(bitmap, cliprect, num, 64+attr, diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index f356e47f657..e4e47b3356a 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -108,7 +108,7 @@ void strnskil_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec sx = sx - 256; - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, code, color, flipx, flipy, px, py, diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c index 4b89649ff99..2f63297e56d 100644 --- a/src/mame/video/subs.c +++ b/src/mame/video/subs.c @@ -74,11 +74,11 @@ UINT32 subs_state::screen_update_subs_left(screen_device &screen, bitmap_ind16 & /* draw the left screen */ if ((left_enable || left_sonar_window) && (!right_sonar_window)) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, charcode, 1, 0,0,sx,sy); else - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, 0, 1, 0,0,sx,sy); } @@ -104,7 +104,7 @@ UINT32 subs_state::screen_update_subs_left(screen_device &screen, bitmap_ind16 & /* left screen - special check for drawing right screen's sub */ if ((offs!=0) || (sub_enable)) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, charcode + 32 * prom_set, 0, 0,0,sx,sy,0); @@ -154,11 +154,11 @@ UINT32 subs_state::screen_update_subs_right(screen_device &screen, bitmap_ind16 /* draw the right screen */ if ((right_enable || right_sonar_window) && (!left_sonar_window)) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, charcode, 0, 0,0,sx,sy); else - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, 0, 0, 0,0,sx,sy); } @@ -183,7 +183,7 @@ UINT32 subs_state::screen_update_subs_right(screen_device &screen, bitmap_ind16 charcode = (charcode >> 3) & 0x1F; if ((offs!=1) || (sub_enable)) - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, charcode + 32 * prom_set, 0, 0,0,sx,sy,0); diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c index c10c2a58963..b9d36b13a94 100644 --- a/src/mame/video/suna16.c +++ b/src/mame/video/suna16.c @@ -188,7 +188,7 @@ void suna16_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, tile_flipy = !tile_flipy; } - m_gfxdecode->gfx(gfx)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(gfx)->transpen(bitmap,cliprect, (tile & 0x3fff) + bank*0x4000, attr + (m_color_bank << 4), tile_flipx, tile_flipy, diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index b75f7860ab7..6a5e541f41c 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -377,7 +377,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(m_palette,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, @@ -441,7 +441,7 @@ void suna8_state::draw_text_sprites(bitmap_ind16 &bitmap,const rectangle &clipre sy = max_y - sy; flipy = !flipy; } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile + (attr & 0x3)*0x100 + bank, (attr >> 2) & 0xf, flipx, flipy, diff --git a/src/mame/video/superchs.c b/src/mame/video/superchs.c index f912056f785..e5c10618cac 100644 --- a/src/mame/video/superchs.c +++ b/src/mame/video/superchs.c @@ -162,7 +162,7 @@ void superchs_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co } else { - m_gfxdecode->gfx(sprite_ptr->gfx)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_ptr->gfx)->zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, @@ -181,7 +181,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); { sprite_ptr--; - m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index 1002e6c4770..0bd56ec9e8a 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(m_palette,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(m_palette,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 54ff6277a14..a3e981b6c24 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(m_palette,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/tagteam.c b/src/mame/video/tagteam.c index 8a87d690ee3..1a64821abad 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -164,7 +164,7 @@ void tagteam_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); @@ -176,7 +176,7 @@ void tagteam_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect sy += (flip_screen() ? -256 : 256); - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index c0c1b60e7e3..c827608816a 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -155,7 +155,7 @@ void tail2nos_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre flipx = spriteram[offs + 2] & 0x1000; flipy = spriteram[offs + 2] & 0x0800; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,/* placement relative to zoom layer verified on the real thing */ + m_gfxdecode->gfx(1)->transpen(bitmap,/* placement relative to zoom layer verified on the real thing */ cliprect, code, 40 + color, diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c index 0a26f5103c1..6a3e843a620 100644 --- a/src/mame/video/taito_f2.c +++ b/src/mame/video/taito_f2.c @@ -761,7 +761,7 @@ void taitof2_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, c } else { - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, @@ -778,7 +778,7 @@ void taitof2_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, c sprite_ptr--; if (!uses_tc360_mixer) - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c index 39af1b4ed0b..451e336f112 100644 --- a/src/mame/video/taito_h.c +++ b/src/mame/video/taito_h.c @@ -145,7 +145,7 @@ void taitoh_state::syvalion_draw_sprites( bitmap_ind16 &bitmap, const rectangle } - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, flipx, flipy, @@ -257,7 +257,7 @@ void taitoh_state::recordbr_draw_sprites( bitmap_ind16 &bitmap, const rectangle } - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, flipx, flipy, @@ -359,7 +359,7 @@ void taitoh_state::dleague_draw_sprites( bitmap_ind16 &bitmap, const rectangle & } - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, flipx, flipy, diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index 0570bddaebf..4d3611ada70 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -253,7 +253,7 @@ void taitol_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, co flipy = !flipy; } - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/taito_o.c b/src/mame/video/taito_o.c index 96d13a831ad..4b085b800cb 100644 --- a/src/mame/video/taito_o.c +++ b/src/mame/video/taito_o.c @@ -119,7 +119,7 @@ void taitoo_state::parentj_draw_sprites( bitmap_ind16 &bitmap, const rectangle & } - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, flipx, flipy, diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c index 1eeaa2823ab..0bb9f7eea2b 100644 --- a/src/mame/video/taito_z.c +++ b/src/mame/video/taito_z.c @@ -221,7 +221,7 @@ void taitoz_state::contcirc_draw_sprites_16x8( screen_device &screen, bitmap_ind flipy = !flipy; } - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -318,7 +318,7 @@ void taitoz_state::chasehq_draw_sprites_16x16( screen_device &screen, bitmap_ind flipy = !flipy; } - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -361,7 +361,7 @@ void taitoz_state::chasehq_draw_sprites_16x16( screen_device &screen, bitmap_ind flipy = !flipy; } - m_gfxdecode->gfx(2)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -404,7 +404,7 @@ void taitoz_state::chasehq_draw_sprites_16x16( screen_device &screen, bitmap_ind flipy = !flipy; } - m_gfxdecode->gfx(2)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -500,7 +500,7 @@ void taitoz_state::bshark_draw_sprites_16x8( screen_device &screen, bitmap_ind16 flipy = !flipy; } - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -604,7 +604,7 @@ void taitoz_state::sci_draw_sprites_16x8( screen_device &screen, bitmap_ind16 &b flipy = !flipy; } - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -698,7 +698,7 @@ void taitoz_state::aquajack_draw_sprites_16x8(screen_device &screen, bitmap_ind1 flipy = !flipy; } - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, @@ -792,7 +792,7 @@ void taitoz_state::spacegun_draw_sprites_16x8(screen_device &screen, bitmap_ind1 flipy = !flipy; } - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c index 1663429e604..d03105d6190 100644 --- a/src/mame/video/taitoair.c +++ b/src/mame/video/taitoair.c @@ -164,7 +164,7 @@ void taitoair_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,cliprect, tile, color, flipx, flipy, diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c index b3931a0ecd9..cc277d358d0 100644 --- a/src/mame/video/taitosj.c +++ b/src/mame/video/taitosj.c @@ -301,7 +301,7 @@ int taitosj_state::check_sprite_sprite_bitpattern(int sx1, int sy1, int which1,i /* draw the sprites into separate bitmaps and check overlapping region */ m_sprite_layer_collbitmap1.fill(TRANSPARENT_PEN); - get_sprite_gfx_element(which1)->transpen(m_palette,m_sprite_sprite_collbitmap1,m_sprite_sprite_collbitmap1.cliprect(), + get_sprite_gfx_element(which1)->transpen(m_sprite_sprite_collbitmap1,m_sprite_sprite_collbitmap1.cliprect(), m_spriteram[SPRITE_RAM_PAGE_OFFSET + offs1 + 3] & 0x3f, 0, m_spriteram[SPRITE_RAM_PAGE_OFFSET + offs1 + 2] & 0x01, @@ -309,7 +309,7 @@ int taitosj_state::check_sprite_sprite_bitpattern(int sx1, int sy1, int which1,i sx1, sy1, 0); m_sprite_sprite_collbitmap2.fill(TRANSPARENT_PEN); - get_sprite_gfx_element(which2)->transpen(m_palette,m_sprite_sprite_collbitmap2,m_sprite_sprite_collbitmap2.cliprect(), + get_sprite_gfx_element(which2)->transpen(m_sprite_sprite_collbitmap2,m_sprite_sprite_collbitmap2.cliprect(), m_spriteram[SPRITE_RAM_PAGE_OFFSET + offs2 + 3] & 0x3f, 0, m_spriteram[SPRITE_RAM_PAGE_OFFSET + offs2 + 2] & 0x01, @@ -455,7 +455,7 @@ int taitosj_state::check_sprite_layer_bitpattern(int which, rectangle *sprite_ar /* draw sprite into a bitmap and check if layers collide */ m_sprite_layer_collbitmap1.fill(TRANSPARENT_PEN); - get_sprite_gfx_element(which)->transpen(m_palette,m_sprite_layer_collbitmap1,m_sprite_layer_collbitmap1.cliprect(), + get_sprite_gfx_element(which)->transpen(m_sprite_layer_collbitmap1,m_sprite_layer_collbitmap1.cliprect(), m_spriteram[SPRITE_RAM_PAGE_OFFSET + offs + 3] & 0x3f, 0, flip_x, flip_y, @@ -513,19 +513,19 @@ void taitosj_state::draw_layers() if (GLOBAL_FLIP_X) sx = 31 - sx; if (GLOBAL_FLIP_Y) sy = 31 - sy; - m_gfxdecode->gfx(m_colorbank[0] & 0x08 ? 2 : 0)->transpen(m_palette,m_layer_bitmap[0],m_layer_bitmap[0].cliprect(), + m_gfxdecode->gfx(m_colorbank[0] & 0x08 ? 2 : 0)->transpen(m_layer_bitmap[0],m_layer_bitmap[0].cliprect(), m_videoram_1[offs], m_colorbank[0] & 0x07, GLOBAL_FLIP_X,GLOBAL_FLIP_Y, 8*sx,8*sy,0); - m_gfxdecode->gfx(m_colorbank[0] & 0x80 ? 2 : 0)->transpen(m_palette,m_layer_bitmap[1],m_layer_bitmap[1].cliprect(), + m_gfxdecode->gfx(m_colorbank[0] & 0x80 ? 2 : 0)->transpen(m_layer_bitmap[1],m_layer_bitmap[1].cliprect(), m_videoram_2[offs], (m_colorbank[0] >> 4) & 0x07, GLOBAL_FLIP_X,GLOBAL_FLIP_Y, 8*sx,8*sy,0); - m_gfxdecode->gfx(m_colorbank[1] & 0x08 ? 2 : 0)->transpen(m_palette,m_layer_bitmap[2],m_layer_bitmap[2].cliprect(), + m_gfxdecode->gfx(m_colorbank[1] & 0x08 ? 2 : 0)->transpen(m_layer_bitmap[2],m_layer_bitmap[2].cliprect(), m_videoram_3[offs], m_colorbank[1] & 0x07, GLOBAL_FLIP_X,GLOBAL_FLIP_Y, @@ -578,11 +578,11 @@ void taitosj_state::draw_sprites(bitmap_ind16 &bitmap) flip_y = !flip_y; } - get_sprite_gfx_element(which)->transpen(m_palette,bitmap,GLOBAL_FLIP_X ? spritevisibleareaflip : spritevisiblearea, code, color, + get_sprite_gfx_element(which)->transpen(bitmap,GLOBAL_FLIP_X ? spritevisibleareaflip : spritevisiblearea, code, color, flip_x, flip_y, sx, sy,0); /* draw with wrap around. The horizontal games (eg. sfposeid) need this */ - get_sprite_gfx_element(which)->transpen(m_palette,bitmap,GLOBAL_FLIP_X ? spritevisibleareaflip : spritevisiblearea, code, color, + get_sprite_gfx_element(which)->transpen(bitmap,GLOBAL_FLIP_X ? spritevisibleareaflip : spritevisiblearea, code, color, flip_x, flip_y, sx - 0x100, sy,0); } } diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c index 8027dbe1ef5..209a4c11d1b 100644 --- a/src/mame/video/tank8.c +++ b/src/mame/video/tank8.c @@ -133,7 +133,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx((code & 0x04) ? 2 : 3)->transpen(bitmap,cliprect, code & 0x03, i, code & 0x10, diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c index 7383dbc5959..92e438bfec0 100644 --- a/src/mame/video/tankbatt.c +++ b/src/mame/video/tankbatt.c @@ -87,7 +87,7 @@ void tankbatt_state::draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprec int x = m_bulletsram[offs + 1]; int y = 255 - m_bulletsram[offs] - 2; - m_gfxdecode->gfx(1)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, 0, /* this is just a square, generated by the hardware */ color, 0,0, diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c index 1b0e3d54b2e..b271d41f6d6 100644 --- a/src/mame/video/tankbust.c +++ b/src/mame/video/tankbust.c @@ -210,7 +210,7 @@ void tankbust_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if ((spriteram[offs+1]!=4)) //otherwise - ghost sprites { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code, color, flipx,flipy, sx,sy,0); diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c index 1c7b8d10e48..a41c7438665 100644 --- a/src/mame/video/targeth.c +++ b/src/mame/video/targeth.c @@ -116,7 +116,7 @@ void targeth_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect int xflip = attr & 0x20; int yflip = attr & 0x40; - gfx->transpen(m_palette,bitmap,cliprect,number, + gfx->transpen(bitmap,cliprect,number, 0x20 + color,xflip,yflip, sx - 0x0f,sy,0); } diff --git a/src/mame/video/taxidriv.c b/src/mame/video/taxidriv.c index dd7ca3b6fdf..619e74e25db 100644 --- a/src/mame/video/taxidriv.c +++ b/src/mame/video/taxidriv.c @@ -31,7 +31,7 @@ UINT32 taxidriv_state::screen_update_taxidriv(screen_device &screen, bitmap_ind1 sx = offs % 32; sy = offs / 32; - m_gfxdecode->gfx(3)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->opaque(bitmap,cliprect, m_vram3[offs], 0, 0,0, @@ -43,7 +43,7 @@ UINT32 taxidriv_state::screen_update_taxidriv(screen_device &screen, bitmap_ind1 sx = offs % 32; sy = offs / 32; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, m_vram2[offs]+256*m_vram2[offs+0x400], 0, 0,0, @@ -109,7 +109,7 @@ UINT32 taxidriv_state::screen_update_taxidriv(screen_device &screen, bitmap_ind1 sx = offs % 32; sy = offs / 32; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, m_vram1[offs], 0, 0,0, @@ -136,7 +136,7 @@ UINT32 taxidriv_state::screen_update_taxidriv(screen_device &screen, bitmap_ind1 sx = offs % 32; sy = offs / 32; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_vram0[offs], 0, 0,0, diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index ac9ab2a7fad..b18d4188aac 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -162,28 +162,28 @@ void tbowl_state::tbowl_draw_sprites(bitmap_ind16 &bitmap,const rectangle &clipr sx -= xscroll; - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code + layout[y][x], color, flipx,flipy, sx,sy,0 ); /* wraparound */ - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code + layout[y][x], color, flipx,flipy, sx,sy-0x200,0 ); /* wraparound */ - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code + layout[y][x], color, flipx,flipy, sx-0x400,sy,0 ); /* wraparound */ - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code + layout[y][x], color, flipx,flipy, diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index bd5e66f1de5..db1475cfe0c 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -475,7 +475,7 @@ void tceptor_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect y -= 78; - m_gfxdecode->gfx(gfx)->zoom_transmask(m_palette,bitmap, + m_gfxdecode->gfx(gfx)->zoom_transmask(bitmap, cliprect, code, color, diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c index ab32854f716..62c5d7ea928 100644 --- a/src/mame/video/tecmo.c +++ b/src/mame/video/tecmo.c @@ -215,7 +215,7 @@ void tecmo_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const { int sx = xpos + 8*(flipx?(size-1-x):x); int sy = ypos + 8*(flipy?(size-1-y):y); - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code + layout[y][x], flags & 0xf, flipx,flipy, diff --git a/src/mame/video/tecmo_spr.c b/src/mame/video/tecmo_spr.c index 40918b24e38..3170692612d 100644 --- a/src/mame/video/tecmo_spr.c +++ b/src/mame/video/tecmo_spr.c @@ -138,7 +138,7 @@ int spbactn_draw_sprites(screen_device &screen, gfxdecode_device *gfxdecode, bit // comad bootleg of spbactn -void galspnbl_draw_sprites( screen_device &screen, gfxdecode_device *gfxdecode, palette_device &palette, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority, UINT16* spriteram, int spriteram_bytes ) +void galspnbl_draw_sprites( screen_device &screen, gfxdecode_device *gfxdecode, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority, UINT16* spriteram, int spriteram_bytes ) { int offs; @@ -169,7 +169,7 @@ void galspnbl_draw_sprites( screen_device &screen, gfxdecode_device *gfxdecode, { int x = sx + 8 * (flipx ? (size - 1 - col) : col); int y = sy + 8 * (flipy ? (size - 1 - row) : row); - gfxdecode->gfx(1)->transpen(palette,bitmap,cliprect, + gfxdecode->gfx(1)->transpen(bitmap,cliprect, code + layout[row][col], color, flipx,flipy, diff --git a/src/mame/video/tecmo_spr.h b/src/mame/video/tecmo_spr.h index 48b62e06a52..e591ef2b2b9 100644 --- a/src/mame/video/tecmo_spr.h +++ b/src/mame/video/tecmo_spr.h @@ -1,6 +1,6 @@ /* Tecmo Sprites */ -void galspnbl_draw_sprites( screen_device &screen, gfxdecode_device *gfxdecode, palette_device &palette, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority, UINT16* spriteram, int spriteram_bytes ); +void galspnbl_draw_sprites( screen_device &screen, gfxdecode_device *gfxdecode, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority, UINT16* spriteram, int spriteram_bytes ); void tecmo16_draw_sprites(screen_device &screen, gfxdecode_device *gfxdecode, bitmap_ind16 &bitmap_bg, bitmap_ind16 &bitmap_fg, bitmap_ind16 &bitmap_sp, const rectangle &cliprect, UINT16* spriteram, UINT16 spriteram16_bytes, int game_is_riot, int flipscreen ); void gaiden_draw_sprites( screen_device &screen, gfxdecode_device *gfxdecode, bitmap_ind16 &bitmap_bg, bitmap_ind16 &bitmap_fg, bitmap_ind16 &bitmap_sp, const rectangle &cliprect, UINT16* spriteram, int sprite_sizey, int spr_offset_y, int flipscreen ); void raiga_draw_sprites( screen_device &screen, gfxdecode_device *gfxdecode, bitmap_ind16 &bitmap_bg, bitmap_ind16 &bitmap_fg, bitmap_ind16 &bitmap_sp, const rectangle &cliprect, UINT16* spriteram, int sprite_sizey, int spr_offset_y, int flipscreen ); diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c index 8d9475378a4..6173a43ec4f 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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); } } diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c index 338aac6c0a6..6a7e2f16851 100644 --- a/src/mame/video/terracre.c +++ b/src/mame/video/terracre.c @@ -81,7 +81,7 @@ void terracre_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - pGfx->transpen(m_palette, + pGfx->transpen( bitmap,cliprect,tile, color,flipx,flipy,sx,sy,transparent_pen ); pSource += 4; diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index c0970e4d665..92104c94ac3 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -377,7 +377,7 @@ static void tetrisp2_draw_sprites( tetrisp2_state *state, _BitmapClass &bitmap, if (priority_ram[(pri | 0x0a00 | 0x0000) / 2] & 0x38) primask |= 1 << 7; - gfx->prio_zoom_transpen(state->m_palette,bitmap,cliprect, + gfx->prio_zoom_transpen(bitmap,cliprect, code, color, flipx, flipy, diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c index 96e31d14cd1..01e6dea8fe9 100644 --- a/src/mame/video/thedeep.c +++ b/src/mame/video/thedeep.c @@ -185,7 +185,7 @@ void thedeep_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect for (y = 0; y < ny; y++) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code + (flipy ? (ny - y - 1) : y), color, flipx,flipy, diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index f161373975b..940c3bb178d 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -267,13 +267,13 @@ static void draw_sprites(running_machine &machine, if (offs < 16) y++; - state->m_gfxdecode->gfx(2 * state->m_graphics_bank + 1)->transpen(state->m_palette,bitmap,cliprect, + state->m_gfxdecode->gfx(2 * state->m_graphics_bank + 1)->transpen(bitmap,cliprect, state->m_spriteram[offs + 1] & 0x3f, state->m_spriteram[offs + 2], flipx, flipy, x, y, 0); - state->m_gfxdecode->gfx(2 * state->m_graphics_bank + 1)->transpen(state->m_palette,bitmap,cliprect, + state->m_gfxdecode->gfx(2 * state->m_graphics_bank + 1)->transpen(bitmap,cliprect, state->m_spriteram[offs + 1] & 0x3f, state->m_spriteram[offs + 2], flipx, flipy, x-256, y, 0); diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c index a2fc5535f2c..5f6f9e577a3 100644 --- a/src/mame/video/thoop2.c +++ b/src/mame/video/thoop2.c @@ -178,7 +178,7 @@ void thoop2_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, ex = xflip ? (spr_size-1-x) : x; ey = yflip ? (spr_size-1-y) : y; - gfx->transpen(m_palette,bitmap,cliprect,number + x_offset[ex] + y_offset[ey], + gfx->transpen(bitmap,cliprect,number + x_offset[ex] + y_offset[ey], color,xflip,yflip, sx-0x0f+x*8,sy+y*8,0); } diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index 93bcf7a4653..2ebdd471bd0 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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, spritecode, 0, flipx, flipy, diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index 5daab8d4d4c..08f6235a422 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -97,7 +97,7 @@ void tigeroad_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec } - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, tile_number, color, flipx, flipy, diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c index 58cb2d210dd..96ff5e43712 100644 --- a/src/mame/video/timelimt.c +++ b/src/mame/video/timelimt.c @@ -126,7 +126,7 @@ void timelimt_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec code += ( attr & 0x80 ) ? 0x40 : 0x00; code += ( attr & 0x40 ) ? 0x80 : 0x00; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code, attr & 7, flipx,flipy, diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c index 5b7241572d1..a36e1617209 100644 --- a/src/mame/video/timeplt.c +++ b/src/mame/video/timeplt.c @@ -187,7 +187,7 @@ void timeplt_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec int flipx = ~spriteram_2[offs] & 0x40; int flipy = spriteram_2[offs] & 0x80; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c index 4324d469032..83d5081ba55 100644 --- a/src/mame/video/toki.c +++ b/src/mame/video/toki.c @@ -193,7 +193,7 @@ void toki_state::toki_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprec flipy=1; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tile, color, flipx,flipy, @@ -230,7 +230,7 @@ void toki_state::tokib_draw_sprites(bitmap_ind16 &bitmap,const rectangle &clipre tile = sprite_word[1] & 0x1fff; color = sprite_word[2] >> 12; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, tile, color, flipx,0, diff --git a/src/mame/video/topspeed.c b/src/mame/video/topspeed.c index dd149a8d17e..db85d5e6470 100644 --- a/src/mame/video/topspeed.c +++ b/src/mame/video/topspeed.c @@ -193,7 +193,7 @@ void topspeed_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, zx = x + (((k + 1) * zoomx) / 8) - curx; zy = y + (((j + 1) * zoomy) / 16) - cury; - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c index efdc450073c..c54a4a368fc 100644 --- a/src/mame/video/toypop.c +++ b/src/mame/video/toypop.c @@ -251,7 +251,7 @@ void toypop_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, { for (int x = 0;x <= sizex;x++) { - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, sprite + gfx_offs[y ^ (sizey & flipy)][x ^ (sizex & flipx)], color, flipx,flipy, diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c index 8c49d6f6527..a1368edd5c3 100644 --- a/src/mame/video/tp84.c +++ b/src/mame/video/tp84.c @@ -161,7 +161,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(m_palette,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, m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, palette_base)); } diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c index 0106d864a29..0407021f834 100644 --- a/src/mame/video/trackfld.c +++ b/src/mame/video/trackfld.c @@ -221,7 +221,7 @@ void trackfld_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre - m_gfxdecode->gfx(0)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, code + m_sprite_bank1 + m_sprite_bank2, color, flipx, flipy, sx, sy, @@ -229,7 +229,7 @@ void trackfld_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre /* redraw with wraparound */ - m_gfxdecode->gfx(0)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transmask(bitmap,cliprect, code + m_sprite_bank1 + m_sprite_bank2, color, flipx, flipy, sx - 256, sy, diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index 5581b195e63..0a0c48a4b27 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -310,7 +310,7 @@ void travrusa_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,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 23af8970307..7cfcb5f0e07 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_palette,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/tryout.c b/src/mame/video/tryout.c index 58c2cce6273..65f26e0a572 100644 --- a/src/mame/video/tryout.c +++ b/src/mame/video/tryout.c @@ -209,17 +209,17 @@ void tryout_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) /* Double Height */ if(spriteram[offs] & 0x10) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite, color,fx,fy,x,y + inc,0); - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite+1, color,fx,fy,x,y,0); } else { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, sprite, color,fx,fy,x,y,0); } diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c index 97385cd4b65..64f0b0125b6 100644 --- a/src/mame/video/tsamurai.c +++ b/src/mame/video/tsamurai.c @@ -164,7 +164,7 @@ void tsamurai_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec if( flip_screen() ) { - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number&0x7f, color, 1,(sprite_number&0x80)?0:1, @@ -172,7 +172,7 @@ void tsamurai_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec } else { - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, sprite_number&0x7f, color, 0,sprite_number&0x80, diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index d53c021bf1f..87475c56560 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -334,7 +334,7 @@ void tunhunt_state::draw_shell(bitmap_ind16 &bitmap, for( sy=0; sy<256; sy+=16 ) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, picture_code, 0, /* color */ 0,0, /* flip */ @@ -359,7 +359,7 @@ void tunhunt_state::draw_shell(bitmap_ind16 &bitmap, */ - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, picture_code, 0, /* color */ 0,0, /* flip */ diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c index b3db61c62f3..1ec3baed0ac 100644 --- a/src/mame/video/ultratnk.c +++ b/src/mame/video/ultratnk.c @@ -73,7 +73,7 @@ UINT32 ultratnk_state::screen_update_ultratnk(screen_device &screen, bitmap_ind1 if (!(attr & 0x80)) { - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (code >> 3) | bank, i, 0, 0, @@ -122,7 +122,7 @@ void ultratnk_state::screen_eof_ultratnk(screen_device &screen, bool state) if (code & 4) bank = 32; - m_gfxdecode->gfx(1)->transpen(m_palette,m_helper,rect, + m_gfxdecode->gfx(1)->transpen(m_helper,rect, (code >> 3) | bank, 4, 0, 0, diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c index 526ff24708b..f1362cc81e9 100644 --- a/src/mame/video/undrfire.c +++ b/src/mame/video/undrfire.c @@ -175,7 +175,7 @@ void undrfire_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co } else { - m_gfxdecode->gfx(sprite_ptr->gfx)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_ptr->gfx)->zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, @@ -194,7 +194,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); { sprite_ptr--; - m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, @@ -313,7 +313,7 @@ void undrfire_state::draw_sprites_cbombers(screen_device &screen, bitmap_ind16 & } else { - m_gfxdecode->gfx(sprite_ptr->gfx)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_ptr->gfx)->zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, @@ -328,7 +328,7 @@ void undrfire_state::draw_sprites_cbombers(screen_device &screen, bitmap_ind16 & { sprite_ptr--; - m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(sprite_ptr->gfx)->prio_zoom_transpen(bitmap,cliprect, sprite_ptr->code, sprite_ptr->color, sprite_ptr->flipx,sprite_ptr->flipy, diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c index 684681b80e9..385dad3e1da 100644 --- a/src/mame/video/unico.c +++ b/src/mame/video/unico.c @@ -230,7 +230,7 @@ void unico_state::unico_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap for (x = startx ; x != endx ; x += incx) { - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, code++, attr & 0x1f, flipx, flipy, diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c index b99d6a6e9f2..fdd0f6b2ccb 100644 --- a/src/mame/video/vastar.c +++ b/src/mame/video/vastar.c @@ -152,13 +152,13 @@ void vastar_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) if (!flip_screen()) sy = 224 - sy; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code/2, color, flipx,flipy, sx,sy,0); /* redraw with wraparound */ - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code/2, color, flipx,flipy, @@ -169,7 +169,7 @@ void vastar_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) if (!flip_screen()) sy = 240 - sy; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx,flipy, diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c index caaf71a1538..33a2cfc1c87 100644 --- a/src/mame/video/vball.c +++ b/src/mame/video/vball.c @@ -100,7 +100,7 @@ void vball_state::vb_mark_all_dirty( ) m_bg_tilemap->mark_all_dirty(); } -#define DRAW_SPRITE( order, sx, sy ) gfx->transpen(m_palette,bitmap,\ +#define DRAW_SPRITE( order, sx, sy ) gfx->transpen(bitmap,\ cliprect, \ (which+order),color,flipx,flipy,sx,sy,0); diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c index c7e120b41dd..625d0f96f4a 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(m_palette,bitmap,rect, + m_gfxdecode->gfx(1)->transpen(bitmap,rect, 0, 0, 0, 0, x + 16 * i, diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c index a7a74bb2c2c..6930e7f06cc 100644 --- a/src/mame/video/vigilant.c +++ b/src/mame/video/vigilant.c @@ -56,7 +56,7 @@ void vigilant_state::update_background() { for( col=0; col<512; col+=32 ) { - m_gfxdecode->gfx(2)->opaque(m_palette,*m_bg_bitmap, + m_gfxdecode->gfx(2)->opaque(*m_bg_bitmap, m_bg_bitmap->cliprect(), charcode, row < 128 ? 0 : 1, @@ -181,7 +181,7 @@ void vigilant_state::draw_foreground(bitmap_ind16 &bitmap, const rectangle &clip { sx = (sx + scroll) & 0x1ff; - m_gfxdecode->gfx(0)->transmask(m_palette,bitmap,bottomvisiblearea, + m_gfxdecode->gfx(0)->transmask(bitmap,bottomvisiblearea, tile_number, color, 0,0, @@ -194,7 +194,7 @@ void vigilant_state::draw_foreground(bitmap_ind16 &bitmap, const rectangle &clip if (sy >= 48) sx = (sx + scroll) & 0x1ff; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, tile_number, color, 0,0, @@ -248,7 +248,7 @@ void vigilant_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect if (flipy) c += h-1-y; else c += y; - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, c, color, flipx,flipy, @@ -270,7 +270,7 @@ UINT32 vigilant_state::screen_update_kikcubic(screen_device &screen, bitmap_ind1 int color = (attributes & 0xF0) >> 4; int tile_number = videoram[offs] | ((attributes & 0x0F) << 8); - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile_number, color, 0,0, diff --git a/src/mame/video/vsystem_spr.c b/src/mame/video/vsystem_spr.c index 26a7db055d9..6ee9d2e4714 100644 --- a/src/mame/video/vsystem_spr.c +++ b/src/mame/video/vsystem_spr.c @@ -257,17 +257,17 @@ void vsystem_spr_device::common_sprite_drawgfx( running_machine &machine, bitmap int startno = m_newtilecb(curr_sprite.map++); if (m_pdraw) { - gfx->prio_zoom_transpen(m_palette,bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap, priority_mask, m_transpen); - gfx->prio_zoom_transpen(m_palette,bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap, priority_mask, m_transpen); - gfx->prio_zoom_transpen(m_palette,bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap, priority_mask, m_transpen); - gfx->prio_zoom_transpen(m_palette,bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap, priority_mask, m_transpen); + gfx->prio_zoom_transpen(bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap, priority_mask, m_transpen); + gfx->prio_zoom_transpen(bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap, priority_mask, m_transpen); + gfx->prio_zoom_transpen(bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap, priority_mask, m_transpen); + gfx->prio_zoom_transpen(bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap, priority_mask, m_transpen); } else { - gfx->zoom_transpen(m_palette,bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); - gfx->zoom_transpen(m_palette,bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); - gfx->zoom_transpen(m_palette,bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); - gfx->zoom_transpen(m_palette,bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); + gfx->zoom_transpen(bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); + gfx->zoom_transpen(bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); + gfx->zoom_transpen(bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); + gfx->zoom_transpen(bitmap,cliprect, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); } xcnt+=xinc; } diff --git a/src/mame/video/vsystem_spr2.c b/src/mame/video/vsystem_spr2.c index b4bf6a0dddb..a97453c531d 100644 --- a/src/mame/video/vsystem_spr2.c +++ b/src/mame/video/vsystem_spr2.c @@ -225,17 +225,17 @@ void vsystem_spr2_device::turbofrc_draw_sprites_common( UINT16* spriteram3, int if (m_pritype == 0 || m_pritype == 1 || m_pritype == 2) // pdrawgfx cases { - m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(m_palette,bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15); - m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(m_palette,bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15); - m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(m_palette,bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15); - m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(m_palette,bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15); + m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15); + m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15); + m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15); + m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15); } else // drawgfx cases (welltris, pipedrm) { - m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(m_palette,bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15); - m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(m_palette,bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15); - m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(m_palette,bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15); - m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(m_palette,bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15); + m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15); + m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15); + m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15); + m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15); } } diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c index b79dc112612..acd83d4c25c 100644 --- a/src/mame/video/vulgus.c +++ b/src/mame/video/vulgus.c @@ -190,14 +190,14 @@ void vulgus_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) do { - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code + i, col, flip_screen(),flip_screen(), sx, sy + 16 * i * dir,15); /* draw again with wraparound */ - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, code + i, col, flip_screen(),flip_screen(), diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c index 47b71f7a3df..8fd7ba81851 100644 --- a/src/mame/video/warriorb.c +++ b/src/mame/video/warriorb.c @@ -61,7 +61,7 @@ void warriorb_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, if (x > 0x3c0) x -= 0x400; if (y > 0x180) y -= 0x200; - m_gfxdecode->gfx(0)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect, tilenum, color, flipx,flipy, diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c index 761d237cb97..8a4bcd7106c 100644 --- a/src/mame/video/wc90.c +++ b/src/mame/video/wc90.c @@ -121,7 +121,7 @@ WRITE8_MEMBER(wc90_state::wc90_txvideoram_w) ***************************************************************************/ #define WC90_DRAW_SPRITE( code, sx, sy ) \ - m_gfxdecode->gfx(3)->transpen(m_palette,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/wc90b.c b/src/mame/video/wc90b.c index 36050c882c9..1eed1448429 100644 --- a/src/mame/video/wc90b.c +++ b/src/mame/video/wc90b.c @@ -111,7 +111,7 @@ void wc90b_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, sy = 240 - spriteram[offs + 1]; - m_gfxdecode->gfx(17)->transpen(m_palette,bitmap,cliprect, code, + m_gfxdecode->gfx(17)->transpen(bitmap,cliprect, code, flags >> 4, /* color */ bank & 1, /* flipx */ bank & 2, /* flipy */ diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index ff41f954a1d..0e1b8a48826 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -809,7 +809,7 @@ static void hotchase_draw_road(running_machine &machine, bitmap_ind16 &bitmap, c for (sx=0; sx<2*XSIZE; sx+=64) { - state->m_gfxdecode->gfx(0)->transpen(state->m_palette,bitmap,cliprect, + state->m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, code++, color, 0,0, diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c index 2bb2439d918..0bb5e3e5424 100644 --- a/src/mame/video/wgp.c +++ b/src/mame/video/wgp.c @@ -417,7 +417,7 @@ void wgp_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const zx = x + (((k + 1) * zoomx) / 2) - curx; zy = y + (((j + 1) * zoomy) / 2) - cury; - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, code, col, flipx, flipy, @@ -448,7 +448,7 @@ void wgp_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const zx = x + (((k + 1) * zoomx) / 4) - curx; zy = y + (((j + 1) * zoomy) / 4) - cury; - m_gfxdecode->gfx(0)->prio_zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->prio_zoom_transpen(bitmap,cliprect, code, col, flipx, flipy, diff --git a/src/mame/video/wiping.c b/src/mame/video/wiping.c index dcfd4f35479..b7f34dcc150 100644 --- a/src/mame/video/wiping.c +++ b/src/mame/video/wiping.c @@ -117,7 +117,7 @@ UINT32 wiping_state::screen_update_wiping(screen_device &screen, bitmap_ind16 &b sy = 27 - sy; } - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_videoram[offs], m_colorram[offs] & 0x3f, m_flipscreen,m_flipscreen, @@ -145,7 +145,7 @@ UINT32 wiping_state::screen_update_wiping(screen_device &screen, bitmap_ind16 &b flipy = !flipy; } - m_gfxdecode->gfx(1)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, (spriteram[offs] & 0x3f) + 64 * otherbank, color, flipx,flipy, @@ -185,7 +185,7 @@ UINT32 wiping_state::screen_update_wiping(screen_device &screen, bitmap_ind16 &b sy = 27 - sy; } - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_videoram[offs], m_colorram[offs] & 0x3f, m_flipscreen,m_flipscreen, diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c index 3539549cf84..f9615bc9665 100644 --- a/src/mame/video/wiz.c +++ b/src/mame/video/wiz.c @@ -140,7 +140,7 @@ void wiz_state::draw_tiles(bitmap_ind16 &bitmap, const rectangle &cliprect, int if (m_flipx) sx = 31 - sx; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, code, palbank | color, m_flipx,m_flipy, @@ -171,7 +171,7 @@ void wiz_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, in if ( m_flipx) sx = 240 - sx; if (!m_flipy) sy = 240 - sy; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, code, palbank | color, m_flipx,m_flipy, diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c index 5622328492f..950cc0cdc7b 100644 --- a/src/mame/video/wolfpack.c +++ b/src/mame/video/wolfpack.c @@ -140,7 +140,7 @@ void wolfpack_state::draw_ship(bitmap_ind16 &bitmap, const rectangle &cliprect) int chop = (scaler[m_ship_size >> 2] * m_ship_h_precess) >> 16; - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->zoom_transpen(bitmap,cliprect, m_ship_pic, 0, m_ship_reflect, 0, @@ -158,7 +158,7 @@ void wolfpack_state::draw_torpedo(bitmap_ind16 &bitmap, const rectangle &cliprec int y; - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, m_torpedo_pic, 0, 0, 0, @@ -194,7 +194,7 @@ void wolfpack_state::draw_pt(bitmap_ind16 &bitmap, const rectangle &cliprect) rect.max_x = 255; - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,rect, + m_gfxdecode->gfx(2)->transpen(bitmap,rect, m_pt_pic, 0, 0, 0, @@ -202,7 +202,7 @@ void wolfpack_state::draw_pt(bitmap_ind16 &bitmap, const rectangle &cliprect) m_pt_pos_select ? 0x70 : 0xA0, 0); - m_gfxdecode->gfx(2)->transpen(m_palette,bitmap,rect, + m_gfxdecode->gfx(2)->transpen(bitmap,rect, m_pt_pic, 0, 0, 0, @@ -255,7 +255,7 @@ UINT32 wolfpack_state::screen_update_wolfpack(screen_device &screen, bitmap_ind1 int code = m_alpha_num_ram[32 * i + j]; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code, m_video_invert, 0, 0, diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c index c96ae34aab1..f156e0e6033 100644 --- a/src/mame/video/wrally.c +++ b/src/mame/video/wrally.c @@ -126,7 +126,7 @@ void wrally_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, } if (!color_effect) { - gfx->transpen(m_palette,bitmap,cliprect,number, + gfx->transpen(bitmap,cliprect,number, 0x20 + color,xflip,yflip, sx - 0x0f,sy,0); } else { diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c index d70832d102b..5c7eeeae4a0 100644 --- a/src/mame/video/wwfsstar.c +++ b/src/mame/video/wwfsstar.c @@ -165,22 +165,22 @@ void wwfsstar_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec { if (!flipy) { - gfx->transpen(m_palette,bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos+16*count,0); + gfx->transpen(bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos+16*count,0); } else { - gfx->transpen(m_palette,bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos+(16*(chain-1))-(16*count),0); + gfx->transpen(bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos+(16*(chain-1))-(16*count),0); } } else { if (!flipy) { - gfx->transpen(m_palette,bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos-(16*(chain-1))+(16*count),0); + gfx->transpen(bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos-(16*(chain-1))+(16*count),0); } else { - gfx->transpen(m_palette,bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos-16*count,0); + gfx->transpen(bitmap,cliprect,number+count,colourbank,flipx,flipy,xpos,ypos-16*count,0); } } } diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c index 308a35b6d5a..68a19c726ec 100644 --- a/src/mame/video/xain.c +++ b/src/mame/video/xain.c @@ -182,12 +182,12 @@ void xain_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) if (attr & 0x80) /* double height */ { - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, numtile, color, flipx,flipy, sx,flipy ? sy+16:sy-16,0); - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, numtile+1, color, flipx,flipy, @@ -195,7 +195,7 @@ void xain_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) } else { - m_gfxdecode->gfx(3)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, numtile, color, flipx,flipy, diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index 350d77228af..13098a70b2a 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -435,34 +435,34 @@ void xevious_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) if (spriteram_3[offs] & 1) /* double width, double height */ { code &= ~3; - m_gfxdecode->gfx(bank)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(bank)->transmask(bitmap,cliprect, code+3,color,flipx,flipy, flipx ? sx : sx+16,flipy ? sy-16 : sy,transmask); - m_gfxdecode->gfx(bank)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(bank)->transmask(bitmap,cliprect, code+1,color,flipx,flipy, flipx ? sx : sx+16,flipy ? sy : sy-16,transmask); } code &= ~2; - m_gfxdecode->gfx(bank)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(bank)->transmask(bitmap,cliprect, code+2,color,flipx,flipy, flipx ? sx+16 : sx,flipy ? sy-16 : sy,transmask); - m_gfxdecode->gfx(bank)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(bank)->transmask(bitmap,cliprect, code,color,flipx,flipy, flipx ? sx+16 : sx,flipy ? sy : sy-16,transmask); } else if (spriteram_3[offs] & 1) /* double width */ { code &= ~1; - m_gfxdecode->gfx(bank)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(bank)->transmask(bitmap,cliprect, code,color,flipx,flipy, flipx ? sx+16 : sx,flipy ? sy-16 : sy,transmask); - m_gfxdecode->gfx(bank)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(bank)->transmask(bitmap,cliprect, code+1,color,flipx,flipy, flipx ? sx : sx+16,flipy ? sy-16 : sy,transmask); } else /* normal */ { - m_gfxdecode->gfx(bank)->transmask(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(bank)->transmask(bitmap,cliprect, code,color,flipx,flipy,sx,sy,transmask); } } diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c index e843619b2cb..e51243b613f 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(m_palette,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/xxmissio.c b/src/mame/video/xxmissio.c index 28f51b31090..60cf887df38 100644 --- a/src/mame/video/xxmissio.c +++ b/src/mame/video/xxmissio.c @@ -105,14 +105,14 @@ void xxmissio_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec px &= 0x1ff; - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, chr, col, fx,fy, px,py,0); if (px>0x1e0) - gfx->transpen(m_palette,bitmap,cliprect, + gfx->transpen(bitmap,cliprect, chr, col, fx,fy, diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index 8cbc498099e..0406db88738 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -618,20 +618,20 @@ void ygv608_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect logerror( "SZ_8X8: sprite=%d\n", code ); code = 0; } - m_gfxdecode->gfx(GFX_8X8_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_8X8_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x10000, color, flipx,flipy, sx,sy,0x00); // redraw with wrap-around if( sx > 512-8 ) - m_gfxdecode->gfx(GFX_8X8_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_8X8_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x10000, color, flipx,flipy, sx-512,sy,0x00); if( sy > 512-8 ) - m_gfxdecode->gfx(GFX_8X8_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_8X8_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x10000, color, flipx,flipy, @@ -648,20 +648,20 @@ void ygv608_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect logerror( "SZ_8X8: sprite=%d\n", code ); code = 0; } - m_gfxdecode->gfx(GFX_16X16_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_16X16_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x4000, color, flipx,flipy, sx,sy,0x00); // redraw with wrap-around if( sx > 512-16 ) - m_gfxdecode->gfx(GFX_16X16_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_16X16_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x4000, color, flipx,flipy, sx-512,sy,0x00); if( sy > 512-16 ) - m_gfxdecode->gfx(GFX_16X16_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_16X16_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x4000, color, flipx,flipy, @@ -678,20 +678,20 @@ void ygv608_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect logerror( "SZ_32X32: sprite=%d\n", code ); code = 0; } - m_gfxdecode->gfx(GFX_32X32_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_32X32_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x1000, color, flipx,flipy, sx,sy,0x00); // redraw with wrap-around if( sx > 512-32 ) - m_gfxdecode->gfx(GFX_32X32_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_32X32_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x1000, color, flipx,flipy, sx-512,sy,0x00); if( sy > 512-32 ) - m_gfxdecode->gfx(GFX_32X32_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_32X32_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x1000, color, flipx,flipy, @@ -708,20 +708,20 @@ void ygv608_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect logerror( "SZ_64X64: sprite=%d\n", code ); code = 0; } - m_gfxdecode->gfx(GFX_64X64_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_64X64_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x400, color, flipx,flipy, sx,sy,0x00); // redraw with wrap-around if( sx > 512-64 ) - m_gfxdecode->gfx(GFX_64X64_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_64X64_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x400, color, flipx,flipy, sx-512,sy,0x00); if( sy > 512-64 ) - m_gfxdecode->gfx(GFX_64X64_4BIT)->transpen(m_palette,bitmap,spriteClip, + m_gfxdecode->gfx(GFX_64X64_4BIT)->transpen(bitmap,spriteClip, code+m_namcond1_gfxbank*0x400, color, flipx,flipy, diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index 2e24c31643a..415da3e0ca1 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -130,7 +130,7 @@ void yiear_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c index 33a925bbf6d..8262efde2c5 100644 --- a/src/mame/video/yunsun16.c +++ b/src/mame/video/yunsun16.c @@ -169,7 +169,7 @@ void yunsun16_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, flipy = !flipy; y = max_y - y - 16; } - m_gfxdecode->gfx(1)->prio_transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect, code, attr & 0x1f, flipx, flipy, diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c index adce84455e2..6eae2678f1c 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_palette,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_palette,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_palette,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(m_palette,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(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(expand)->transpen(bitmap,cliprect, spriteno, 0, 0,0, diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c index ef4e299ed89..10eea74d5f9 100644 --- a/src/mame/video/zaccaria.c +++ b/src/mame/video/zaccaria.c @@ -229,7 +229,7 @@ void zaccaria_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, (spriteram[offs + o1] & 0x3f) + (spriteram[offs + o2] & 0xc0), ((spriteram[offs + o2] & 0x07) << 2) | color, flipx,flipy,sx,sy,0); diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index 1b2d0514416..813db2b6864 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -428,10 +428,10 @@ void zaxxon_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int sx = find_minimum_x(spriteram[offs + 3], flip); /* draw with 256 pixel offsets to ensure we wrap properly */ - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx, sy - 0x100, 0); - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx - 0x100, sy, 0); - gfx->transpen(m_palette,bitmap,cliprect, code, color, flipx, flipy, sx - 0x100, sy - 0x100, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy - 0x100, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx - 0x100, sy, 0); + gfx->transpen(bitmap,cliprect, code, color, flipx, flipy, sx - 0x100, sy - 0x100, 0); } } diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index 9dde54eec7a..fe36a99139f 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -126,7 +126,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_palette, + m_gfxdecode->gfx(2)->transpen( bitmap, cliprect, 0, /* this is just a dot, generated by the hardware */ @@ -152,7 +152,7 @@ void zodiack_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec flipy = !flipy; } - m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, spritecode, m_spriteram[offs + 2] & 0x07, flipx, flipy, diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c index 8fef34b7e8f..4af55394eee 100644 --- a/src/mess/drivers/apexc.c +++ b/src/mess/drivers/apexc.c @@ -591,7 +591,7 @@ void apexc_state::apexc_draw_led(bitmap_ind16 &bitmap, int x, int y, int state) /* write a single char on screen */ void apexc_state::apexc_draw_char(bitmap_ind16 &bitmap, char character, int x, int y, int color) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,bitmap.cliprect(), character-32, color, 0, 0, + m_gfxdecode->gfx(0)->transpen(bitmap,bitmap.cliprect(), character-32, color, 0, 0, x+1, y, 0); } diff --git a/src/mess/drivers/ax20.c b/src/mess/drivers/ax20.c index 8c250cd5400..5928552f533 100644 --- a/src/mess/drivers/ax20.c +++ b/src/mess/drivers/ax20.c @@ -50,7 +50,7 @@ UINT32 ax20_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co { UINT16 tile = m_p_vram[24 + y * 128 + x ] & 0x7f; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, tile, 0, 0, 0, x*8, y*12); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*12); } } diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c index a43d432d6aa..7ec82efc362 100644 --- a/src/mess/drivers/casloopy.c +++ b/src/mess/drivers/casloopy.c @@ -267,7 +267,7 @@ UINT32 casloopy_state::screen_update_casloopy(screen_device &screen, bitmap_ind1 tile &= 0x7ff; //??? - gfx->transpen(m_palette,bitmap,cliprect,tile,7,0,0,x*8,y*8,0xffffffff); + gfx->transpen(bitmap,cliprect,tile,7,0,0,x*8,y*8,0xffffffff); count+=2; } diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c index d5c4b2f06cc..809098cbe2a 100644 --- a/src/mess/drivers/itt3030.c +++ b/src/mess/drivers/itt3030.c @@ -362,7 +362,7 @@ UINT32 itt3030_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap for(int x = 0; x < 80; x++ ) { UINT8 code = m_vram[x + y*128]; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, x*8,y*16); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, x*8,y*16); } } diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c index 1fa9c0373fe..7add8866d0c 100644 --- a/src/mess/drivers/multi8.c +++ b/src/mess/drivers/multi8.c @@ -183,7 +183,7 @@ UINT32 multi8_state::screen_update_multi8(screen_device &screen, bitmap_ind16 &b } } - // m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, tile,color >> 5, 0, 0, x*8, y*8); + // m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile,color >> 5, 0, 0, x*8, y*8); // draw cursor if(mc6845_cursor_addr+0xc000 == count) diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c index e2380b12abe..c3ace56fea7 100644 --- a/src/mess/drivers/pv1000.c +++ b/src/mess/drivers/pv1000.c @@ -358,12 +358,12 @@ UINT32 pv1000_state::screen_update_pv1000(screen_device &screen, bitmap_ind16 &b if ( tile < 0xe0 || m_force_pattern ) { tile += ( m_pcg_bank << 8); - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 ); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 ); } else { tile -= 0xe0; - m_gfxdecode->gfx(1)->opaque(m_palette,bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 ); + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8 ); } } } diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c index d67dc4bc91d..b73f69ac2f4 100644 --- a/src/mess/drivers/supracan.c +++ b/src/mess/drivers/supracan.c @@ -567,7 +567,7 @@ void supracan_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec //printf("sprite data %04x %04x %04x %04x\n", supracan_vram[i+0] , supracan_vram[i+1] , supracan_vram[i+2] ,supracan_vram[i+3] ); - gfx->transpen(m_palette,bitmap,cliprect,tile,palette,sprite_xflip,sprite_yflip, + gfx->transpen(bitmap,cliprect,tile,palette,sprite_xflip,sprite_yflip, x, y, 0); @@ -614,7 +614,7 @@ void supracan_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec int tile_xflip = sprite_xflip ^ ((data & 0x0800)>>11); int tile_yflip = sprite_yflip ^ ((data & 0x0400)>>10); - gfx->transpen(m_palette,bitmap,cliprect,tile,palette,tile_xflip,tile_yflip,xpos,ypos,0); + gfx->transpen(bitmap,cliprect,tile,palette,tile_xflip,tile_yflip,xpos,ypos,0); } } } diff --git a/src/mess/drivers/ti99_2.c b/src/mess/drivers/ti99_2.c index 72485c6e4a1..2fec7a024ff 100644 --- a/src/mess/drivers/ti99_2.c +++ b/src/mess/drivers/ti99_2.c @@ -173,7 +173,7 @@ UINT32 ti99_2_state::screen_update_ti99_2(screen_device &screen, bitmap_ind16 &b for (i = 0; i < 768; i++) { /* Is the char code masked or not ??? */ - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[i] & 0x7F, 0, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[i] & 0x7F, 0, 0, 0, sx, sy); sx += 8; diff --git a/src/mess/drivers/tk80bs.c b/src/mess/drivers/tk80bs.c index 39e887964d7..34eef386212 100644 --- a/src/mess/drivers/tk80bs.c +++ b/src/mess/drivers/tk80bs.c @@ -71,7 +71,7 @@ UINT32 tk80bs_state::screen_update_tk80bs(screen_device &screen, bitmap_ind16 &b { int tile = m_p_videoram[count++]; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, tile, 0, 0, 0, x*8, y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, tile, 0, 0, 0, x*8, y*8); } } diff --git a/src/mess/video/733_asr.c b/src/mess/video/733_asr.c index b400b34c058..20eb5ca08cb 100644 --- a/src/mess/video/733_asr.c +++ b/src/mess/video/733_asr.c @@ -209,7 +209,7 @@ void asr733_device::set_interrupt_line() /* write a single char on screen */ void asr733_device::draw_char(int character, int x, int y, int color) { - m_gfxdecode->gfx(0)->opaque(*m_palette, *m_bitmap, m_bitmap->cliprect(), character-32, color, 0, 0, x+1, y); + m_gfxdecode->gfx(0)->opaque(*m_bitmap, m_bitmap->cliprect(), character-32, color, 0, 0, x+1, y); } void asr733_device::linefeed() diff --git a/src/mess/video/911_vdt.c b/src/mess/video/911_vdt.c index 419c8e8d39e..4505ae459e1 100644 --- a/src/mess/video/911_vdt.c +++ b/src/mess/video/911_vdt.c @@ -500,7 +500,7 @@ void vdt911_device::refresh(bitmap_ind16 &bitmap, const rectangle &cliprect, int address++; - gfx->opaque(*m_palette, bitmap, cliprect, cur_char, color, 0, 0, + gfx->opaque(bitmap, cliprect, cur_char, color, 0, 0, x+j*7, y+i*10); } } diff --git a/src/mess/video/ac1.c b/src/mess/video/ac1.c index 44353fb920c..fdcf5c58de9 100644 --- a/src/mess/video/ac1.c +++ b/src/mess/video/ac1.c @@ -36,7 +36,7 @@ UINT32 ac1_state::screen_update_ac1(screen_device &screen, bitmap_ind16 &bitmap, for(x = 0; x < 64; x++ ) { int code = space.read_byte(AC1_VIDEO_MEMORY + x + y*64); - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, 63*6-x*6,15*8-y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, 63*6-x*6,15*8-y*8); } } return 0; @@ -52,7 +52,7 @@ UINT32 ac1_state::screen_update_ac1_32(screen_device &screen, bitmap_ind16 &bitm for(x = 0; x < 64; x++ ) { int code = space.read_byte(AC1_VIDEO_MEMORY + x + y*64); - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, 63*6-x*6,31*8-y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, 63*6-x*6,31*8-y*8); } } return 0; diff --git a/src/mess/video/arcadia.c b/src/mess/video/arcadia.c index 47e2f17f307..7889b150afd 100644 --- a/src/mess/video/arcadia.c +++ b/src/mess/video/arcadia.c @@ -453,8 +453,8 @@ void arcadia_state::arcadia_draw_char(UINT8 *ch, int charcode, int y, int x) { m_bg[y+1][x>>3]|=b>>(x&7); m_bg[y+1][(x>>3)+1]|=b<<(8-(x&7)); - m_gfxdecode->gfx(0)->opaque(m_palette,*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y); - m_gfxdecode->gfx(0)->opaque(m_palette,*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y+1); + m_gfxdecode->gfx(0)->opaque(*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y); + m_gfxdecode->gfx(0)->opaque(*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y+1); } } } @@ -466,7 +466,7 @@ void arcadia_state::arcadia_draw_char(UINT8 *ch, int charcode, int y, int x) m_bg[y][x>>3]|=b>>(x&7); m_bg[y][(x>>3)+1]|=b<<(8-(x&7)); - m_gfxdecode->gfx(0)->opaque(m_palette,*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y); + m_gfxdecode->gfx(0)->opaque(*m_bitmap,m_bitmap->cliprect(), b,colour, 0,0,x,y); } } } diff --git a/src/mess/video/cgenie.c b/src/mess/video/cgenie.c index 2999ec7f1c3..6a733bac327 100644 --- a/src/mess/video/cgenie.c +++ b/src/mess/video/cgenie.c @@ -261,7 +261,7 @@ void cgenie_state::cgenie_refresh_monitor(bitmap_ind16 &bitmap, const rectangle { /* get graphics code */ code = videoram[i]; - m_gfxdecode->gfx(1)->opaque(m_palette,bitmap,r, code, 0, + m_gfxdecode->gfx(1)->opaque(bitmap,r, code, 0, 0, 0, r.min_x, r.min_y); } else @@ -271,7 +271,7 @@ void cgenie_state::cgenie_refresh_monitor(bitmap_ind16 &bitmap, const rectangle /* translate defined character sets */ code += m_font_offset[(code >> 6) & 3]; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,r, code, m_colorram[i&0x3ff], + m_gfxdecode->gfx(0)->opaque(bitmap,r, code, m_colorram[i&0x3ff], 0, 0, r.min_x, r.min_y); } @@ -300,7 +300,7 @@ void cgenie_state::cgenie_refresh_monitor(bitmap_ind16 &bitmap, const rectangle rc.max_x = r.max_x; rc.min_y = r.min_y + (m_crt.cursor_top & 15); rc.max_y = r.min_y + (m_crt.cursor_bottom & 15); - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,rc, 0x7f, m_colorram[i&0x3ff], + m_gfxdecode->gfx(0)->opaque(bitmap,rc, 0x7f, m_colorram[i&0x3ff], 0, 0, rc.min_x, rc.min_y); } } @@ -341,9 +341,9 @@ void cgenie_state::cgenie_refresh_tv_set(bitmap_ind16 &bitmap, const rectangle & { /* get graphics code */ code = videoram[i]; - m_gfxdecode->gfx(1)->opaque(m_palette,m_bitmap,r, code, 1, + m_gfxdecode->gfx(1)->opaque(m_bitmap,r, code, 1, 0, 0, r.min_x, r.min_y); - m_gfxdecode->gfx(1)->opaque(m_palette,m_dlybitmap,r, code, 2, + m_gfxdecode->gfx(1)->opaque(m_dlybitmap,r, code, 2, 0, 0, r.min_x, r.min_y); } else @@ -353,9 +353,9 @@ void cgenie_state::cgenie_refresh_tv_set(bitmap_ind16 &bitmap, const rectangle & /* translate defined character sets */ code += m_font_offset[(code >> 6) & 3]; - m_gfxdecode->gfx(0)->opaque(m_palette,m_bitmap,r, code, m_colorram[i&0x3ff] + 16, + m_gfxdecode->gfx(0)->opaque(m_bitmap,r, code, m_colorram[i&0x3ff] + 16, 0, 0, r.min_x, r.min_y); - m_gfxdecode->gfx(0)->opaque(m_palette,m_dlybitmap,r, code, m_colorram[i&0x3ff] + 32, + m_gfxdecode->gfx(0)->opaque(m_dlybitmap,r, code, m_colorram[i&0x3ff] + 32, 0, 0, r.min_x, r.min_y); } @@ -385,9 +385,9 @@ void cgenie_state::cgenie_refresh_tv_set(bitmap_ind16 &bitmap, const rectangle & rc.min_y = r.min_y + (m_crt.cursor_top & 15); rc.max_y = r.min_y + (m_crt.cursor_bottom & 15); - m_gfxdecode->gfx(0)->opaque(m_palette,m_bitmap,rc, 0x7f, m_colorram[i&0x3ff] + 16, + m_gfxdecode->gfx(0)->opaque(m_bitmap,rc, 0x7f, m_colorram[i&0x3ff] + 16, 0, 0, rc.min_x, rc.min_y); - m_gfxdecode->gfx(0)->opaque(m_palette,m_dlybitmap,rc, 0x7f, m_colorram[i&0x3ff] + 32, + m_gfxdecode->gfx(0)->opaque(m_dlybitmap,rc, 0x7f, m_colorram[i&0x3ff] + 32, 0, 0, rc.min_x, rc.min_y); } } diff --git a/src/mess/video/comquest.c b/src/mess/video/comquest.c index cf42088b7d3..6160e845795 100644 --- a/src/mess/video/comquest.c +++ b/src/mess/video/comquest.c @@ -13,7 +13,7 @@ UINT32 comquest_state::screen_update_comquest(screen_device &screen, bitmap_ind1 for (y=0; y<128;y++) { for (x=0, j=0; j<8;j++,x+=8*4) { #if 0 - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,0, state->m_data[y][j],0, + m_gfxdecode->gfx(0)->opaque(bitmap,0, state->m_data[y][j],0, 0,0,x,y); #endif } diff --git a/src/mess/video/galeb.c b/src/mess/video/galeb.c index 6fb96ebcd84..576036491b4 100644 --- a/src/mess/video/galeb.c +++ b/src/mess/video/galeb.c @@ -36,7 +36,7 @@ UINT32 galeb_state::screen_update_galeb(screen_device &screen, bitmap_ind16 &bit for(x = 0; x < 48; x++ ) { int code = m_video_ram[15 + x + y*64]; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, x*8,y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, x*8,y*8); } } return 0; diff --git a/src/mess/video/intv.c b/src/mess/video/intv.c index 889807462a9..cd418092c03 100644 --- a/src/mess/video/intv.c +++ b/src/mess/video/intv.c @@ -83,7 +83,7 @@ UINT32 intv_state::screen_update_intvkbd(screen_device &screen, bitmap_ind16 &bi { offs = current_row*64+x; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, videoram[offs], 7, /* white */ 0,0, @@ -94,7 +94,7 @@ UINT32 intv_state::screen_update_intvkbd(screen_device &screen, bitmap_ind16 &bi /* draw the cursor as a solid white block */ /* (should use a filled rect here!) */ - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,cliprect, + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, 191, /* a block */ 7, /* white */ 0,0, @@ -107,25 +107,25 @@ UINT32 intv_state::screen_update_intvkbd(screen_device &screen, bitmap_ind16 &bi #if 0 // debugging c = tape_motor_mode_desc[m_tape_motor_mode][0]; - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(0)->transpen(bitmap,&machine().screen[0].visarea, c, 1, 0,0, 0*8,0*8, 0); for(y=0;y<5;y++) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(0)->transpen(bitmap,&machine().screen[0].visarea, m_tape_unknown_write[y]+'0', 1, 0,0, 0*8,(y+2)*8, 0); } - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(0)->transpen(bitmap,&machine().screen[0].visarea, m_tape_unknown_write[5]+'0', 1, 0,0, 0*8,8*8, 0); - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(0)->transpen(bitmap,&machine().screen[0].visarea, m_tape_interrupts_enabled+'0', 1, 0,0, diff --git a/src/mess/video/kramermc.c b/src/mess/video/kramermc.c index 65df531d75c..dfedb9c59ba 100644 --- a/src/mess/video/kramermc.c +++ b/src/mess/video/kramermc.c @@ -37,7 +37,7 @@ UINT32 kramermc_state::screen_update_kramermc(screen_device &screen, bitmap_ind1 for(x = 0; x < 64; x++ ) { int code = space.read_byte(KRAMERMC_VIDEO_MEMORY + x + y*64); - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code , 0, 0,0, x*8,y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, x*8,y*8); } } return 0; diff --git a/src/mess/video/mz700.c b/src/mess/video/mz700.c index a006a36aac1..57518738997 100644 --- a/src/mess/video/mz700.c +++ b/src/mess/video/mz700.c @@ -60,7 +60,7 @@ UINT32 mz_state::screen_update_mz700(screen_device &screen, bitmap_ind16 &bitmap color = m_colorram[offs]; code = videoram[offs] | (color & 0x80) << 1; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code, color, 0, 0, sx, sy); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code, color, 0, 0, sx, sy); } return 0; diff --git a/src/mess/video/nascom1.c b/src/mess/video/nascom1.c index 31099f5e6ed..1a2356d3654 100644 --- a/src/mess/video/nascom1.c +++ b/src/mess/video/nascom1.c @@ -17,7 +17,7 @@ UINT32 nascom1_state::screen_update_nascom1(screen_device &screen, bitmap_ind16 for (sx = 0; sx < 48; sx++) { - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[0x03ca + sx], + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x03ca + sx], 1, 0, 0, sx * 8, 0); } @@ -26,7 +26,7 @@ UINT32 nascom1_state::screen_update_nascom1(screen_device &screen, bitmap_ind16 for (sx = 0; sx < 48; sx++) { - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[0x000a + (sy * 64) + sx], + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x000a + (sy * 64) + sx], 1, 0, 0, sx * 8, (sy + 1) * 16); } } @@ -41,7 +41,7 @@ UINT32 nascom1_state::screen_update_nascom2(screen_device &screen, bitmap_ind16 for (sx = 0; sx < 48; sx++) { - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[0x03ca + sx], + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x03ca + sx], 1, 0, 0, sx * 8, 0); } @@ -50,7 +50,7 @@ UINT32 nascom1_state::screen_update_nascom2(screen_device &screen, bitmap_ind16 for (sx = 0; sx < 48; sx++) { - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, videoram[0x000a + (sy * 64) + sx], + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, videoram[0x000a + (sy * 64) + sx], 1, 0, 0, sx * 8, (sy + 1) * 14); } } diff --git a/src/mess/video/p2000m.c b/src/mess/video/p2000m.c index 0c0b6030bc2..8b8ead9aab6 100644 --- a/src/mess/video/p2000m.c +++ b/src/mess/video/p2000m.c @@ -41,7 +41,7 @@ UINT32 p2000t_state::screen_update_p2000m(screen_device &screen, bitmap_ind16 &b if (code < 32) code = 32; } - m_gfxdecode->gfx(0)->zoom_opaque(m_palette,bitmap,cliprect, code, + m_gfxdecode->gfx(0)->zoom_opaque(bitmap,cliprect, code, videoram[offs + 2048] & 0x08 ? 0 : 1, 0, 0, sx, sy, 0x20000, 0x20000); if (videoram[offs] & 0x80) diff --git a/src/mess/video/pc1251.c b/src/mess/video/pc1251.c index e8dce7f3b85..1bf93ac97bd 100644 --- a/src/mess/video/pc1251.c +++ b/src/mess/video/pc1251.c @@ -125,14 +125,14 @@ UINT32 pc1251_state::screen_update_pc1251(screen_device &screen, bitmap_ind16 &b for (x=RIGHT,y=DOWN, i=0; i<60; x+=3) { for (j=0; j<5; j++, i++, x+=3) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i], + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i], PC1251_CONTRAST,0,0, x,y); } for (i=0x7b; i>=0x40; x+=3) { for (j=0; j<5; j++, i--, x+=3) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i], + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i], PC1251_CONTRAST,0,0, x,y); } diff --git a/src/mess/video/pc1401.c b/src/mess/video/pc1401.c index 24f828bd6f7..4a8f088f1e4 100644 --- a/src/mess/video/pc1401.c +++ b/src/mess/video/pc1401.c @@ -148,12 +148,12 @@ UINT32 pc1401_state::screen_update_pc1401(screen_device &screen, bitmap_ind16 &b for (x=RIGHT,y=DOWN,i=0; i<0x28;x+=2) { for (j=0; j<5;j++,i++,x+=2) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,x,y); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,x,y); } for (i=0x67; i>=0x40;x+=2) { for (j=0; j<5;j++,i--,x+=2) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0,x,y); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0,x,y); } } diff --git a/src/mess/video/pc1403.c b/src/mess/video/pc1403.c index a9eea82370b..999f6a76b17 100644 --- a/src/mess/video/pc1403.c +++ b/src/mess/video/pc1403.c @@ -159,37 +159,37 @@ UINT32 pc1403_state::screen_update_pc1403(screen_device &screen, bitmap_ind16 &b { for (x=m_RIGHT, y=m_DOWN, i=0; i<6*5; x+=2) { for (j=0; j<5; j++, i++, x+=2) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0, x,y); } for (i=9*5; i<12*5; x+=2) { for (j=0; j<5; j++, i++, x+=2) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0, x,y); } for (i=6*5; i<9*5; x+=2) { for (j=0; j<5; j++, i++, x+=2) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0, x,y); } for (i=0x7b-3*5; i>0x7b-6*5; x+=2) { for (j=0; j<5; j++, i--, x+=2) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0, x,y); } for (i=0x7b; i>0x7b-3*5; x+=2) { for (j=0; j<5; j++, i--, x+=2) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0, x,y); } for (i=0x7b-6*5; i>0x7b-12*5; x+=2) { for (j=0; j<5; j++, i--, x+=2) - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, m_reg[i],CONTRAST,0,0, + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_reg[i],CONTRAST,0,0, x,y); } } diff --git a/src/mess/video/pdp1.c b/src/mess/video/pdp1.c index 4215d6325b2..a32523b0fae 100644 --- a/src/mess/video/pdp1.c +++ b/src/mess/video/pdp1.c @@ -220,7 +220,7 @@ void pdp1_state::pdp1_draw_multipleswitch(bitmap_ind16 &bitmap, int x, int y, in /* write a single char on screen */ void pdp1_state::pdp1_draw_char(bitmap_ind16 &bitmap, char character, int x, int y, int color) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,bitmap.cliprect(), character-32, color, 0, 0, + m_gfxdecode->gfx(0)->transpen(bitmap,bitmap.cliprect(), character-32, color, 0, 0, x+1, y, 0); } diff --git a/src/mess/video/stic.c b/src/mess/video/stic.c index 5cf9488d2af..2e0f572fc29 100644 --- a/src/mess/video/stic.c +++ b/src/mess/video/stic.c @@ -677,7 +677,7 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground) m_gramdirtybytes[code] = 0; } // Draw GRAM char - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(1)->zoom_transpen(bitmap,&machine().screen[0].visarea, code, s->color, s->xflip,s->yflip, @@ -700,13 +700,13 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground) m_gramdirtybytes[code+1] = 0; } // Draw GRAM char - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(1)->zoom_transpen(bitmap,&machine().screen[0].visarea, code, s->color, s->xflip,s->yflip, (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT, 0x8000*s->xsize, 0x8000*s->ysize,0); - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(1)->zoom_transpen(bitmap,&machine().screen[0].visarea, code+1, s->color, s->xflip,s->yflip, @@ -719,7 +719,7 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground) if (s->yres == 1) { // Draw GROM char - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,&machine().screen[0].visarea, code, s->color, s->xflip,s->yflip, @@ -728,13 +728,13 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground) } else { - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,&machine().screen[0].visarea, code, s->color, s->xflip,s->yflip, (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT, 0x8000*s->xsize, 0x8000*s->ysize,0); - m_gfxdecode->gfx(0)->zoom_transpen(m_palette,bitmap,&machine().screen[0].visarea, + m_gfxdecode->gfx(0)->zoom_transpen(bitmap,&machine().screen[0].visarea, code+1, s->color, s->xflip,s->yflip, diff --git a/src/mess/video/tx0.c b/src/mess/video/tx0.c index ea9efd84dd8..93d29e29378 100644 --- a/src/mess/video/tx0.c +++ b/src/mess/video/tx0.c @@ -197,7 +197,7 @@ void tx0_state::tx0_draw_multipleswitch(bitmap_ind16 &bitmap, int x, int y, int /* write a single char on screen */ void tx0_state::tx0_draw_char(bitmap_ind16 &bitmap, char character, int x, int y, int color) { - m_gfxdecode->gfx(0)->transpen(m_palette,bitmap,bitmap.cliprect(), character-32, color, 0, 0, + m_gfxdecode->gfx(0)->transpen(bitmap,bitmap.cliprect(), character-32, color, 0, 0, x+1, y, 0); } diff --git a/src/mess/video/ut88.c b/src/mess/video/ut88.c index 4f796cfe53f..34f9b41c3a3 100644 --- a/src/mess/video/ut88.c +++ b/src/mess/video/ut88.c @@ -35,7 +35,7 @@ UINT32 ut88_state::screen_update_ut88(screen_device &screen, bitmap_ind16 &bitma { int code = m_p_videoram[ x + y*64 ] & 0x7f; int attr = m_p_videoram[ x+1 + y*64 ] & 0x80; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect, code | attr, 0, 0,0, x*8,y*8); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code | attr, 0, 0,0, x*8,y*8); } } return 0; diff --git a/src/mess/video/vtech2.c b/src/mess/video/vtech2.c index d171c044e26..2173973717d 100644 --- a/src/mess/video/vtech2.c +++ b/src/mess/video/vtech2.c @@ -142,7 +142,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi sy = BORDER_V/2 + y; sx = BORDER_H/2 + x * 8; code = videoram[offs]; - m_gfxdecode->gfx(2)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy); + m_gfxdecode->gfx(2)->opaque(bitmap,cliprect,code,color,0,0,sx,sy); } } break; @@ -162,7 +162,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi sx = BORDER_H/2 + x * 16; code = videoram[offs]; color = videoram[offs+1]; - m_gfxdecode->gfx(3)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy); + m_gfxdecode->gfx(3)->opaque(bitmap,cliprect,code,color,0,0,sx,sy); } } break; @@ -181,7 +181,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi sy = BORDER_V/2 + y; sx = BORDER_H/2 + x * 8; code = videoram[offs]; - m_gfxdecode->gfx(5)->opaque(m_palette,bitmap,cliprect,code,0,0,0,sx,sy); + m_gfxdecode->gfx(5)->opaque(bitmap,cliprect,code,0,0,0,sx,sy); } } break; @@ -201,7 +201,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi sy = BORDER_V/2 + y * 2; sx = BORDER_H/2 + x * 8; code = videoram[offs]; - m_gfxdecode->gfx(6)->opaque(m_palette,bitmap,cliprect,code,0,0,0,sx,sy); + m_gfxdecode->gfx(6)->opaque(bitmap,cliprect,code,0,0,0,sx,sy); } } break; @@ -220,7 +220,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi sy = BORDER_V/2 + y; sx = BORDER_H/2 + x * 16; code = videoram[offs]; - m_gfxdecode->gfx(3)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy); + m_gfxdecode->gfx(3)->opaque(bitmap,cliprect,code,color,0,0,sx,sy); } } break; @@ -240,7 +240,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi sx = BORDER_H/2 + x * 32; code = videoram[offs]; color = videoram[offs+1]; - m_gfxdecode->gfx(4)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy); + m_gfxdecode->gfx(4)->opaque(bitmap,cliprect,code,color,0,0,sx,sy); } } break; @@ -261,7 +261,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi sy = BORDER_V/2 + y * 8; sx = BORDER_H/2 + x * 8; code = videoram[0x3800+offs]; - m_gfxdecode->gfx(0)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,code,color,0,0,sx,sy); } } } @@ -278,7 +278,7 @@ UINT32 vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bi sx = BORDER_H/2 + x * 16; code = videoram[0x3800+offs]; color = videoram[0x3801+offs]; - m_gfxdecode->gfx(1)->opaque(m_palette,bitmap,cliprect,code,color,0,0,sx,sy); + m_gfxdecode->gfx(1)->opaque(bitmap,cliprect,code,color,0,0,sx,sy); } } } diff --git a/src/mess/video/x68k.c b/src/mess/video/x68k.c index 8ff6ae7240f..26c2820fd91 100644 --- a/src/mess/video/x68k.c +++ b/src/mess/video/x68k.c @@ -1011,7 +1011,7 @@ void x68k_state::x68k_draw_sprites(bitmap_ind16 &bitmap, int priority, rectangle sx += m_crtc.bg_hshift; sx += m_sprite_shift; - m_gfxdecode->gfx(1)->zoom_transpen(m_palette,bitmap,cliprect,code,colour+0x10,xflip,yflip,m_crtc.hbegin+sx,m_crtc.vbegin+(sy*m_crtc.bg_double),0x10000,0x10000*m_crtc.bg_double,0x00); + m_gfxdecode->gfx(1)->zoom_transpen(bitmap,cliprect,code,colour+0x10,xflip,yflip,m_crtc.hbegin+sx,m_crtc.vbegin+(sy*m_crtc.bg_double),0x10000,0x10000*m_crtc.bg_double,0x00); } } } |