Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 01:18:59 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

deco16ic.cpp : Updates (#4978)

Browse Source 
Allow masked priority behavior, Use shorter / correct type values, Fix spacings
This commit is contained in:
R. Belmont 2019-05-08 09:52:22 -04:00 committed by GitHub
commit 0e1a10d8af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 90 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/mame/video/deco16ic.cpp
View File

@ -249,9 +249,9 @@ void deco16ic_device::device_start()
m_pf1_8bpp_mode = 0; m_pf1_8bpp_mode = 0;
m_pf1_data = make_unique_clear<uint16_t[]>(0x2000 / 2); m_pf1_data = make_unique_clear<u16[]>(0x2000 / 2);
m_pf2_data = make_unique_clear<uint16_t[]>(0x2000 / 2); m_pf2_data = make_unique_clear<u16[]>(0x2000 / 2);
m_pf12_control = make_unique_clear<uint16_t[]>(0x10 / 2); m_pf12_control = make_unique_clear<u16[]>(0x10 / 2);
save_item(NAME(m_use_custom_pf1)); save_item(NAME(m_use_custom_pf1));
save_item(NAME(m_use_custom_pf2)); save_item(NAME(m_use_custom_pf2));
@ -292,9 +292,9 @@ TILEMAP_MAPPER_MEMBER(deco16ic_device::deco16_scan_rows)
TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info) TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info)
{ {
uint16_t tile = m_pf2_data[tile_index]; const u16 tile = m_pf2_data[tile_index];
uint8_t colour = (tile >> 12) & 0xf; u8 colour = (tile >> 12) & 0xf;
uint8_t flags = 0; u8 flags = 0;
if (tile & 0x8000) if (tile & 0x8000)
{ {
@ -318,9 +318,9 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info)
TILE_GET_INFO_MEMBER(deco16ic_device::get_pf1_tile_info) TILE_GET_INFO_MEMBER(deco16ic_device::get_pf1_tile_info)
{ {
uint16_t tile = m_pf1_data[tile_index]; const u16 tile = m_pf1_data[tile_index];
uint8_t colour = (tile >> 12) & 0xf; u8 colour = (tile >> 12) & 0xf;
uint8_t flags = 0; u8 flags = 0;
if (tile & 0x8000) if (tile & 0x8000)
{ {
@ -357,9 +357,9 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf1_tile_info)
TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info_b) TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info_b)
{ {
uint16_t tile = m_pf2_data[tile_index]; const u16 tile = m_pf2_data[tile_index];
uint8_t colour = (tile >> 12) & 0xf; u8 colour = (tile >> 12) & 0xf;
uint8_t flags = 0; u8 flags = 0;
if (tile & 0x8000) if (tile & 0x8000)
{ {
@ -383,9 +383,9 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info_b)
TILE_GET_INFO_MEMBER(deco16ic_device::get_pf1_tile_info_b) TILE_GET_INFO_MEMBER(deco16ic_device::get_pf1_tile_info_b)
{ {
uint16_t tile = m_pf1_data[tile_index]; const u16 tile = m_pf1_data[tile_index];
uint8_t colour = (tile >> 12) & 0xf; u8 colour = (tile >> 12) & 0xf;
uint8_t flags = 0; u8 flags = 0;
if (tile & 0x8000) if (tile & 0x8000)
{ {
@ -427,27 +427,27 @@ void deco16ic_device::custom_tilemap_draw(
tilemap_t *tilemap0_16x16, tilemap_t *tilemap0_16x16,
tilemap_t *tilemap1_8x8, tilemap_t *tilemap1_8x8,
tilemap_t *tilemap1_16x16, tilemap_t *tilemap1_16x16,
const uint16_t *rowscroll_ptr, const u16 *rowscroll_ptr,
const uint16_t scrollx, const u16 scrollx,
const uint16_t scrolly, const u16 scrolly,
const uint16_t control0, const u16 control0,
const uint16_t control1, const u16 control1,
int combine_mask, int combine_mask,
int combine_shift, int combine_shift,
int trans_mask, int trans_mask,
int flags, int flags,
uint32_t priority, u8 priority,
int is_tattoo int is_tattoo,
u8 pmask
) )
{ {
tilemap_t *tilemap0 = BIT(control1, 7) ? tilemap0_8x8 : tilemap0_16x16; tilemap_t *tilemap0 = BIT(control1, 7) ? tilemap0_8x8 : tilemap0_16x16;
tilemap_t *tilemap1 = BIT(control1, 7) ? tilemap1_8x8 : tilemap1_16x16; tilemap_t *tilemap1 = BIT(control1, 7) ? tilemap1_8x8 : tilemap1_16x16;
const bitmap_ind16 *src_bitmap0 = tilemap0 ? &tilemap0->pixmap() : nullptr; const bitmap_ind16 *src_bitmap0 = tilemap0 ? &tilemap0->pixmap() : nullptr;
const bitmap_ind16 *src_bitmap1 = tilemap1 ? &tilemap1->pixmap() : nullptr; const bitmap_ind16 *src_bitmap1 = tilemap1 ? &tilemap1->pixmap() : nullptr;
int width_mask, height_mask, x, y, p; int column_offset, src_x = 0;
int column_offset, src_x = 0, src_y = 0; const int row_type = 1 << ((control0 >> 3) & 0xf);
int row_type = 1 << ((control0 >> 3) & 0xf); const int col_type = 8 << (control0 & 7);
int col_type = 8 << (control0 & 7);
if (!src_bitmap0) if (!src_bitmap0)
return; return;
@ -456,32 +456,32 @@ void deco16ic_device::custom_tilemap_draw(
if (!BIT(control0, 7)) if (!BIT(control0, 7))
return; return;
int starty = cliprect.top(); const int starty = cliprect.top();
int endy = cliprect.bottom() + 1; const int endy = cliprect.bottom() + 1;
width_mask = src_bitmap0->width() - 1; const int width_mask = src_bitmap0->width() - 1;
height_mask = src_bitmap0->height() - 1; const int height_mask = src_bitmap0->height() - 1;
src_y = (scrolly + starty) & height_mask; int src_y = (scrolly + starty) & height_mask;
for (int y = starty; y < endy; y++)
for (y = starty; y < endy; y++)
{ {
if (rowscroll_ptr && BIT(control1, 6)) if (rowscroll_ptr && BIT(control1, 6))
src_x = scrollx + rowscroll_ptr[src_y / row_type]; src_x = scrollx + rowscroll_ptr[src_y / row_type];
else else
src_x = scrollx; src_x = scrollx;
src_x += cliprect.left();
src_x &= width_mask; src_x &= width_mask;
/* boogwing */ /* boogwing */
for (x = 0; x < 320; x++) for (int x = cliprect.left(); x < cliprect.right(); x++)
{ {
if (rowscroll_ptr && BIT(control1, 5)) if (rowscroll_ptr && BIT(control1, 5))
column_offset = rowscroll_ptr[0x200 + ((src_x & 0x1ff) / col_type)]; column_offset = rowscroll_ptr[0x200 + ((src_x & 0x1ff) / col_type)];
else else
column_offset = 0; column_offset = 0;
p = src_bitmap0->pix16((src_y + column_offset) & height_mask, src_x); u16 p = src_bitmap0->pix16((src_y + column_offset) & height_mask, src_x);
if (src_bitmap1) if (src_bitmap1)
{ {
@ -492,8 +492,8 @@ void deco16ic_device::custom_tilemap_draw(
} }
else else
{ {
uint16_t p2 = src_bitmap1->pix16((src_y + column_offset) & height_mask, src_x); const u16 p2 = src_bitmap1->pix16((src_y + column_offset) & height_mask, src_x);
p = 0x200+( ((p&0x30)<<4) | (p&0x0f) | ((p2 & 0x0f)<<4)); p = 0x200 + (((p & 0x30) << 4) | (p & 0x0f) | ((p2 & 0x0f) << 4));
} }
} }
src_x = (src_x + 1) & width_mask; src_x = (src_x + 1) & width_mask;
@ -503,8 +503,8 @@ void deco16ic_device::custom_tilemap_draw(
bitmap.pix(y, x) = m_gfxdecode->palette().pen(p); bitmap.pix(y, x) = m_gfxdecode->palette().pen(p);
if (screen.priority().valid()) if (screen.priority().valid())
{ {
uint8_t *pri = &screen.priority().pix8(y); u8 *pri = &screen.priority().pix8(y);
pri[x] |= priority; pri[x] = (pri[x] & pmask) | priority;
} }
} }
} }
@ -537,7 +537,7 @@ void deco16ic_device::set_pf1_8bpp_mode(int mode)
} }
/* robocop 2 can switch between 2 tilemaps at 4bpp, or 1 at 8bpp */ /* robocop 2 can switch between 2 tilemaps at 4bpp, or 1 at 8bpp */
void deco16ic_device::set_tilemap_colour_mask( int tmap, int mask ) void deco16ic_device::set_tilemap_colour_mask(int tmap, int mask)
{ {
switch (tmap) switch (tmap)
{ {
@ -546,7 +546,7 @@ void deco16ic_device::set_tilemap_colour_mask( int tmap, int mask )
} }
} }
void deco16ic_device::pf12_set_gfxbank( int small, int big ) void deco16ic_device::pf12_set_gfxbank(int small, int big)
{ {
if (m_pf12_last_big != big) if (m_pf12_last_big != big)
{ {
@ -572,7 +572,7 @@ void deco16ic_device::pf12_set_gfxbank( int small, int big )
} }
/* stoneage has broken scroll registers, original tumble pop expects a 1 pixel offset */ /* stoneage has broken scroll registers, original tumble pop expects a 1 pixel offset */
void deco16ic_device::set_scrolldx( int tmap, int size, int dx, int dx_if_flipped ) void deco16ic_device::set_scrolldx(int tmap, int size, int dx, int dx_if_flipped)
{ {
switch (tmap) switch (tmap)
{ {
@ -592,7 +592,7 @@ void deco16ic_device::set_scrolldx( int tmap, int size, int dx, int dx_if_flippe
} }
/* cninjabl does not enable background layers */ /* cninjabl does not enable background layers */
void deco16ic_device::set_enable( int tmap, int enable ) void deco16ic_device::set_enable(int tmap, int enable)
{ {
int shift = (tmap & 1) ? 15 : 7; int shift = (tmap & 1) ? 15 : 7;
m_pf12_control[5] &= ~(1 << shift); m_pf12_control[5] &= ~(1 << shift);
@ -682,11 +682,11 @@ void deco16ic_device::pf2_data_dword_w(offs_t offset, u32 data, u32 mem_mask)
static int deco16_pf_update( static int deco16_pf_update(
tilemap_t *tilemap_8x8, tilemap_t *tilemap_8x8,
tilemap_t *tilemap_16x16, tilemap_t *tilemap_16x16,
const uint16_t *rowscroll_ptr, const u16 *rowscroll_ptr,
const uint16_t scrollx, const u16 scrollx,
const uint16_t scrolly, const u16 scrolly,
const uint16_t control0, const u16 control0,
const uint16_t control1, const u16 control1,
const int tilemapsizes const int tilemapsizes
) )
{ {
@ -846,7 +846,7 @@ static int deco16_pf_update(
return use_custom; return use_custom;
} }
void deco16ic_device::pf_update( const uint16_t *rowscroll_1_ptr, const uint16_t *rowscroll_2_ptr ) void deco16ic_device::pf_update(const u16 *rowscroll_1_ptr, const u16 *rowscroll_2_ptr)
{ {
int bank1, bank2; int bank1, bank2;
@ -911,60 +911,60 @@ void deco16ic_device::print_debug_info(bitmap_ind16 &bitmap)
/*****************************************************************************************/ /*****************************************************************************************/
template<class _BitmapClass> template<class _BitmapClass>
void deco16ic_device::tilemap_1_draw_common( screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int flags, uint32_t priority ) void deco16ic_device::tilemap_1_draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask)
{ {
if (m_use_custom_pf1) if (m_use_custom_pf1)
{ {
custom_tilemap_draw(screen, bitmap, cliprect, m_pf1_tilemap_8x8, m_pf1_tilemap_16x16, nullptr, nullptr, m_pf1_rowscroll_ptr, m_pf12_control[1], m_pf12_control[2], m_pf12_control[5] & 0xff, m_pf12_control[6] & 0xff, 0, 0, m_pf1_trans_mask, flags, priority, 0); custom_tilemap_draw(screen, bitmap, cliprect, m_pf1_tilemap_8x8, m_pf1_tilemap_16x16, nullptr, nullptr, m_pf1_rowscroll_ptr, m_pf12_control[1], m_pf12_control[2], m_pf12_control[5] & 0xff, m_pf12_control[6] & 0xff, 0, 0, m_pf1_trans_mask, flags, priority, 0, pmask);
} }
else else
{ {
if (m_pf1_tilemap_8x8) if (m_pf1_tilemap_8x8)
m_pf1_tilemap_8x8->draw(screen, bitmap, cliprect, flags, priority); m_pf1_tilemap_8x8->draw(screen, bitmap, cliprect, flags, priority, pmask);
if (m_pf1_tilemap_16x16) if (m_pf1_tilemap_16x16)
m_pf1_tilemap_16x16->draw(screen, bitmap, cliprect, flags, priority); m_pf1_tilemap_16x16->draw(screen, bitmap, cliprect, flags, priority, pmask);
} }
} }
void deco16ic_device::tilemap_1_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, uint32_t priority ) void deco16ic_device::tilemap_1_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask)
{ tilemap_1_draw_common(screen, bitmap, cliprect, flags, priority); } { tilemap_1_draw_common(screen, bitmap, cliprect, flags, priority, pmask); }
void deco16ic_device::tilemap_1_draw( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, uint32_t priority ) void deco16ic_device::tilemap_1_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask)
{ tilemap_1_draw_common(screen, bitmap, cliprect, flags, priority); } { tilemap_1_draw_common(screen, bitmap, cliprect, flags, priority, pmask); }
template<class _BitmapClass> template<class _BitmapClass>
void deco16ic_device::tilemap_2_draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int flags, uint32_t priority) void deco16ic_device::tilemap_2_draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask)
{ {
if (m_use_custom_pf2) if (m_use_custom_pf2)
{ {
custom_tilemap_draw(screen, bitmap, cliprect, m_pf2_tilemap_8x8, m_pf2_tilemap_16x16, nullptr, nullptr, m_pf2_rowscroll_ptr, m_pf12_control[3], m_pf12_control[4], m_pf12_control[5] >> 8, m_pf12_control[6] >> 8, 0, 0, m_pf2_trans_mask, flags, priority, 0); custom_tilemap_draw(screen, bitmap, cliprect, m_pf2_tilemap_8x8, m_pf2_tilemap_16x16, nullptr, nullptr, m_pf2_rowscroll_ptr, m_pf12_control[3], m_pf12_control[4], m_pf12_control[5] >> 8, m_pf12_control[6] >> 8, 0, 0, m_pf2_trans_mask, flags, priority, 0, pmask);
} }
else else
{ {
if (m_pf2_tilemap_8x8) if (m_pf2_tilemap_8x8)
m_pf2_tilemap_8x8->draw(screen, bitmap, cliprect, flags, priority); m_pf2_tilemap_8x8->draw(screen, bitmap, cliprect, flags, priority, pmask);
if (m_pf2_tilemap_16x16) if (m_pf2_tilemap_16x16)
m_pf2_tilemap_16x16->draw(screen, bitmap, cliprect, flags, priority); m_pf2_tilemap_16x16->draw(screen, bitmap, cliprect, flags, priority, pmask);
} }
} }
void deco16ic_device::tilemap_2_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, uint32_t priority ) void deco16ic_device::tilemap_2_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask)
{ tilemap_2_draw_common(screen, bitmap, cliprect, flags, priority); } { tilemap_2_draw_common(screen, bitmap, cliprect, flags, priority, pmask); }
void deco16ic_device::tilemap_2_draw( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, uint32_t priority ) void deco16ic_device::tilemap_2_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask)
{ tilemap_2_draw_common(screen, bitmap, cliprect, flags, priority); } { tilemap_2_draw_common(screen, bitmap, cliprect, flags, priority, pmask); }
/*****************************************************************************************/ /*****************************************************************************************/
// Combines the output of two 4BPP tilemaps into an 8BPP tilemap // Combines the output of two 4BPP tilemaps into an 8BPP tilemap
void deco16ic_device::tilemap_12_combine_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, uint32_t priority, int is_tattoo) void deco16ic_device::tilemap_12_combine_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, u8 priority, int is_tattoo, u8 pmask)
{ {
custom_tilemap_draw(screen, bitmap, cliprect, nullptr, m_pf1_tilemap_16x16, nullptr, m_pf2_tilemap_16x16, m_pf1_rowscroll_ptr, m_pf12_control[1], m_pf12_control[2], m_pf12_control[5] & 0xff, m_pf12_control[6] & 0xff, 0xf, 4, 0xff, flags, priority, is_tattoo); custom_tilemap_draw(screen, bitmap, cliprect, nullptr, m_pf1_tilemap_16x16, nullptr, m_pf2_tilemap_16x16, m_pf1_rowscroll_ptr, m_pf12_control[1], m_pf12_control[2], m_pf12_control[5] & 0xff, m_pf12_control[6] & 0xff, 0xf, 4, 0xff, flags, priority, is_tattoo, pmask);
} }
void deco16ic_device::tilemap_12_combine_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, uint32_t priority, int is_tattoo) void deco16ic_device::tilemap_12_combine_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, u8 priority, int is_tattoo, u8 pmask)
{ {
custom_tilemap_draw(screen, bitmap, cliprect, nullptr, m_pf1_tilemap_16x16, nullptr, m_pf2_tilemap_16x16, m_pf1_rowscroll_ptr, m_pf12_control[1], m_pf12_control[2], m_pf12_control[5] & 0xff, m_pf12_control[6] & 0xff, 0xf, 4, 0xff, flags, priority, is_tattoo); custom_tilemap_draw(screen, bitmap, cliprect, nullptr, m_pf1_tilemap_16x16, nullptr, m_pf2_tilemap_16x16, m_pf1_rowscroll_ptr, m_pf12_control[1], m_pf12_control[2], m_pf12_control[5] & 0xff, m_pf12_control[6] & 0xff, 0xf, 4, 0xff, flags, priority, is_tattoo, pmask);
} }

41
src/mame/video/deco16ic.h
View File

@ -69,20 +69,20 @@ public:
void print_debug_info(bitmap_ind16 &bitmap); void print_debug_info(bitmap_ind16 &bitmap);
void pf_update(const uint16_t *rowscroll_1_ptr, const uint16_t *rowscroll_2_ptr); void pf_update(const u16 *rowscroll_1_ptr, const u16 *rowscroll_2_ptr);
template<class _BitmapClass> template<class _BitmapClass>
void tilemap_1_draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int flags, uint32_t priority); void tilemap_1_draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask = 0xff);
template<class _BitmapClass> template<class _BitmapClass>
void tilemap_2_draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int flags, uint32_t priority); void tilemap_2_draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask = 0xff);
void tilemap_1_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, uint32_t priority); void tilemap_1_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask = 0xff);
void tilemap_1_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, uint32_t priority); void tilemap_1_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask = 0xff);
void tilemap_2_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, uint32_t priority); void tilemap_2_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask = 0xff);
void tilemap_2_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, uint32_t priority); void tilemap_2_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, u8 priority, u8 pmask = 0xff);
/* used by boogwing, nitrobal */ /* used by boogwing, nitrobal */
void tilemap_12_combine_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, uint32_t priority, int is_tattoo = false); void tilemap_12_combine_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, u8 priority, int is_tattoo = false, u8 pmask = 0xff);
void tilemap_12_combine_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, uint32_t priority, int is_tattoo = false); void tilemap_12_combine_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flags, u8 priority, int is_tattoo = false, u8 pmask = 0xff);
/* used by robocop2 */ /* used by robocop2 */
void set_tilemap_colour_mask(int tmap, int mask); void set_tilemap_colour_mask(int tmap, int mask);
@ -109,17 +109,18 @@ public:
tilemap_t *tilemap0_16x16, tilemap_t *tilemap0_16x16,
tilemap_t *tilemap1_8x8, tilemap_t *tilemap1_8x8,
tilemap_t *tilemap1_16x16, tilemap_t *tilemap1_16x16,
const uint16_t *rowscroll_ptr, const u16 *rowscroll_ptr,
const uint16_t scrollx, const u16 scrollx,
const uint16_t scrolly, const u16 scrolly,
const uint16_t control0, const u16 control0,
const uint16_t control1, const u16 control1,
int combine_mask, int combine_mask,
int combine_shift, int combine_shift,
int trans_mask, int trans_mask,
int flags, int flags,
uint32_t priority, u8 priority,
int is_tattoo int is_tattoo,
u8 pmask = 0xff
); );
protected: protected:
@ -129,11 +130,11 @@ protected:
private: private:
// internal state // internal state
std::unique_ptr<uint16_t[]> m_pf1_data; std::unique_ptr<u16[]> m_pf1_data;
std::unique_ptr<uint16_t[]> m_pf2_data; std::unique_ptr<u16[]> m_pf2_data;
std::unique_ptr<uint16_t[]> m_pf12_control; std::unique_ptr<u16[]> m_pf12_control;
const uint16_t *m_pf1_rowscroll_ptr, *m_pf2_rowscroll_ptr; const u16 *m_pf1_rowscroll_ptr, *m_pf2_rowscroll_ptr;
tilemap_t *m_pf1_tilemap_16x16, *m_pf2_tilemap_16x16; tilemap_t *m_pf1_tilemap_16x16, *m_pf2_tilemap_16x16;
tilemap_t *m_pf1_tilemap_8x8, *m_pf2_tilemap_8x8; tilemap_t *m_pf1_tilemap_8x8, *m_pf2_tilemap_8x8;