From 47bcfe80b4bcc5577b17fddace2f3c16130551fa Mon Sep 17 00:00:00 2001 From: AJR Date: Thu, 6 Apr 2017 19:03:56 -0400 Subject: v9938: A little cleanup (nw) --- src/devices/video/v9938.cpp | 162 ++++++++++++++++++++++---------------------- src/devices/video/v9938.h | 42 ++++++------ 2 files changed, 102 insertions(+), 102 deletions(-) diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp index 510ff787501..2401da27494 100644 --- a/src/devices/video/v9938.cpp +++ b/src/devices/video/v9938.cpp @@ -932,53 +932,53 @@ inline bool v99x8_device::v9938_second_field() } -void v99x8_device::default_border(const pen_t *pens, uint16_t *ln) +void v99x8_device::default_border(uint16_t *ln) { - uint16_t pen; + pen_t pen; int i; - pen = pens[m_pal_ind16[(m_cont_reg[7]&0x0f)]]; + pen = this->pen(m_pal_ind16[m_cont_reg[7] & 0x0f]); i = LONG_WIDTH; while (i--) *ln++ = pen; } -void v99x8_device::graphic7_border(const pen_t *pens, uint16_t *ln) +void v99x8_device::graphic7_border(uint16_t *ln) { - uint16_t pen; + pen_t pen; int i; - pen = pens[m_pal_ind256[m_cont_reg[7]]]; + pen = this->pen(m_pal_ind256[m_cont_reg[7]]); i = LONG_WIDTH; while (i--) *ln++ = pen; } -void v99x8_device::graphic5_border(const pen_t *pens, uint16_t *ln) +void v99x8_device::graphic5_border(uint16_t *ln) { int i; - uint16_t pen0; - uint16_t pen1; + pen_t pen0; + pen_t pen1; - pen1 = pens[m_pal_ind16[(m_cont_reg[7]&0x03)]]; - pen0 = pens[m_pal_ind16[((m_cont_reg[7]>>2)&0x03)]]; + pen1 = pen(m_pal_ind16[m_cont_reg[7] & 0x03]); + pen0 = pen(m_pal_ind16[(m_cont_reg[7] >> 2) & 0x03]); i = LONG_WIDTH / 2; while (i--) { *ln++ = pen0; *ln++ = pen1; } } -void v99x8_device::mode_text1(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_text1(uint16_t *ln, int line) { int pattern, x, xx, name, xxx; - uint16_t fg, bg, pen; + pen_t fg, bg, pen; int nametbl_addr, patterntbl_addr; patterntbl_addr = m_cont_reg[4] << 11; nametbl_addr = m_cont_reg[2] << 10; - fg = pens[m_pal_ind16[m_cont_reg[7] >> 4]]; - bg = pens[m_pal_ind16[m_cont_reg[7] & 15]]; + fg = this->pen(m_pal_ind16[m_cont_reg[7] >> 4]); + bg = this->pen(m_pal_ind16[m_cont_reg[7] & 15]); name = (line/8)*40; - pen = pens[m_pal_ind16[(m_cont_reg[7]&0x0f)]]; + pen = this->pen(m_pal_ind16[m_cont_reg[7] & 0x0f]); xxx = (m_offset_x + 8) * 2; while (xxx--) *ln++ = pen; @@ -1001,10 +1001,10 @@ void v99x8_device::mode_text1(const pen_t *pens, uint16_t *ln, int line) while (xxx--) *ln++ = pen; } -void v99x8_device::mode_text2(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_text2(uint16_t *ln, int line) { int pattern, x, charcode, name, xxx, patternmask, colourmask; - uint16_t fg, bg, fg0, bg0, pen; + pen_t fg, bg, fg0, bg0, pen; int nametbl_addr, patterntbl_addr, colourtbl_addr; patterntbl_addr = m_cont_reg[4] << 11; @@ -1017,15 +1017,15 @@ void v99x8_device::mode_text2(const pen_t *pens, uint16_t *ln, int line) nametbl_addr = ((m_cont_reg[2] & 0xfc) << 10); patternmask = ((m_cont_reg[2] & 3) << 10) | 0x3ff; /* seems correct */ - fg = pens[m_pal_ind16[m_cont_reg[7] >> 4]]; - bg = pens[m_pal_ind16[m_cont_reg[7] & 15]]; - fg0 = pens[m_pal_ind16[m_cont_reg[12] >> 4]]; - bg0 = pens[m_pal_ind16[m_cont_reg[12] & 15]]; + fg = this->pen(m_pal_ind16[m_cont_reg[7] >> 4]); + bg = this->pen(m_pal_ind16[m_cont_reg[7] & 15]); + fg0 = this->pen(m_pal_ind16[m_cont_reg[12] >> 4]); + bg0 = this->pen(m_pal_ind16[m_cont_reg[12] & 15]); name = (line/8)*80; xxx = (m_offset_x + 8) * 2; - pen = pens[m_pal_ind16[(m_cont_reg[7]&0x0f)]]; + pen = this->pen(m_pal_ind16[m_cont_reg[7] & 0x0f]); while (xxx--) *ln++ = pen; for (x=0;x<80;x++) @@ -1068,11 +1068,11 @@ void v99x8_device::mode_text2(const pen_t *pens, uint16_t *ln, int line) while (xxx--) *ln++ = pen; } -void v99x8_device::mode_multi(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_multi(uint16_t *ln, int line) { int nametbl_addr, patterntbl_addr, colour; int name, line2, x, xx; - uint16_t pen, pen_bg; + pen_t pen, pen_bg; nametbl_addr = (m_cont_reg[2] << 10); patterntbl_addr = (m_cont_reg[4] << 11); @@ -1080,14 +1080,14 @@ void v99x8_device::mode_multi(const pen_t *pens, uint16_t *ln, int line) line2 = (line - m_cont_reg[23]) & 255; name = (line2/8)*32; - pen_bg = pens[m_pal_ind16[(m_cont_reg[7]&0x0f)]]; + pen_bg = this->pen(m_pal_ind16[m_cont_reg[7] & 0x0f]); xx = m_offset_x * 2; while (xx--) *ln++ = pen_bg; for (x=0;x<32;x++) { colour = m_vram_space->read_byte(patterntbl_addr + (m_vram_space->read_byte(nametbl_addr + name) * 8) + ((line2/4)&7)); - pen = pens[m_pal_ind16[colour>>4]]; + pen = this->pen(m_pal_ind16[colour >> 4]); /* eight pixels */ *ln++ = pen; *ln++ = pen; @@ -1097,7 +1097,7 @@ void v99x8_device::mode_multi(const pen_t *pens, uint16_t *ln, int line) *ln++ = pen; *ln++ = pen; *ln++ = pen; - pen = pens[m_pal_ind16[colour&15]]; + pen = this->pen(m_pal_ind16[colour & 15]); /* eight pixels */ *ln++ = pen; *ln++ = pen; @@ -1114,9 +1114,9 @@ void v99x8_device::mode_multi(const pen_t *pens, uint16_t *ln, int line) while (xx--) *ln++ = pen_bg; } -void v99x8_device::mode_graphic1(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_graphic1(uint16_t *ln, int line) { - uint16_t fg, bg, pen; + pen_t fg, bg, pen; int nametbl_addr, patterntbl_addr, colourtbl_addr; int pattern, x, xx, line2, name, charcode, colour, xxx; @@ -1128,7 +1128,7 @@ void v99x8_device::mode_graphic1(const pen_t *pens, uint16_t *ln, int line) name = (line2/8)*32; - pen = pens[m_pal_ind16[(m_cont_reg[7]&0x0f)]]; + pen = this->pen(m_pal_ind16[m_cont_reg[7] & 0x0f]); xxx = m_offset_x * 2; while (xxx--) *ln++ = pen; @@ -1136,8 +1136,8 @@ void v99x8_device::mode_graphic1(const pen_t *pens, uint16_t *ln, int line) { charcode = m_vram_space->read_byte(nametbl_addr + name); colour = m_vram_space->read_byte(colourtbl_addr + charcode/8); - fg = pens[m_pal_ind16[colour>>4]]; - bg = pens[m_pal_ind16[colour&15]]; + fg = this->pen(m_pal_ind16[colour >> 4]); + bg = this->pen(m_pal_ind16[colour & 15]); pattern = m_vram_space->read_byte(patterntbl_addr + (charcode * 8 + (line2 & 7))); for (xx=0;xx<8;xx++) @@ -1153,9 +1153,9 @@ void v99x8_device::mode_graphic1(const pen_t *pens, uint16_t *ln, int line) while (xx--) *ln++ = pen; } -void v99x8_device::mode_graphic23(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_graphic23(uint16_t *ln, int line) { - uint16_t fg, bg, pen; + pen_t fg, bg, pen; int nametbl_addr, patterntbl_addr, colourtbl_addr; int pattern, x, xx, line2, name, charcode, colour, colourmask, patternmask, xxx; @@ -1170,7 +1170,7 @@ void v99x8_device::mode_graphic23(const pen_t *pens, uint16_t *ln, int line) line2 = (line + m_cont_reg[23]) & 255; name = (line2/8)*32; - pen = pens[m_pal_ind16[(m_cont_reg[7]&0x0f)]]; + pen = this->pen(m_pal_ind16[m_cont_reg[7] & 0x0f]); xxx = m_offset_x * 2; while (xxx--) *ln++ = pen; @@ -1179,8 +1179,8 @@ void v99x8_device::mode_graphic23(const pen_t *pens, uint16_t *ln, int line) charcode = m_vram_space->read_byte(nametbl_addr + name) + (line2&0xc0)*4; colour = m_vram_space->read_byte(colourtbl_addr + ((charcode&colourmask)*8+(line2&7))); pattern = m_vram_space->read_byte(patterntbl_addr + ((charcode&patternmask)*8+(line2&7))); - fg = pens[m_pal_ind16[colour>>4]]; - bg = pens[m_pal_ind16[colour&15]]; + fg = this->pen(m_pal_ind16[colour >> 4]); + bg = this->pen(m_pal_ind16[colour & 15]); for (xx=0;xx<8;xx++) { *ln++ = (pattern & 0x80) ? fg : bg; @@ -1194,11 +1194,11 @@ void v99x8_device::mode_graphic23(const pen_t *pens, uint16_t *ln, int line) while (xx--) *ln++ = pen; } -void v99x8_device::mode_graphic4(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_graphic4(uint16_t *ln, int line) { int nametbl_addr, colour; int line2, linemask, x, xx; - uint16_t pen, pen_bg; + pen_t pen, pen_bg; linemask = ((m_cont_reg[2] & 0x1f) << 3) | 7; @@ -1208,17 +1208,17 @@ void v99x8_device::mode_graphic4(const pen_t *pens, uint16_t *ln, int line) if ( (m_cont_reg[2] & 0x20) && v9938_second_field() ) nametbl_addr += 0x8000; - pen_bg = pens[m_pal_ind16[(m_cont_reg[7]&0x0f)]]; + pen_bg = this->pen(m_pal_ind16[m_cont_reg[7] & 0x0f]); xx = m_offset_x * 2; while (xx--) *ln++ = pen_bg; for (x=0;x<128;x++) { colour = m_vram_space->read_byte(nametbl_addr++); - pen = pens[m_pal_ind16[colour>>4]]; + pen = this->pen(m_pal_ind16[colour >> 4]); *ln++ = pen; *ln++ = pen; - pen = pens[m_pal_ind16[colour&15]]; + pen = this->pen(m_pal_ind16[colour & 15]); *ln++ = pen; *ln++ = pen; } @@ -1227,12 +1227,12 @@ void v99x8_device::mode_graphic4(const pen_t *pens, uint16_t *ln, int line) while (xx--) *ln++ = pen_bg; } -void v99x8_device::mode_graphic5(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_graphic5(uint16_t *ln, int line) { int nametbl_addr, colour; int line2, linemask, x, xx; - uint16_t pen_bg0[4]; - uint16_t pen_bg1[4]; + pen_t pen_bg0[4]; + pen_t pen_bg1[4]; linemask = ((m_cont_reg[2] & 0x1f) << 3) | 7; @@ -1242,8 +1242,8 @@ void v99x8_device::mode_graphic5(const pen_t *pens, uint16_t *ln, int line) if ( (m_cont_reg[2] & 0x20) && v9938_second_field() ) nametbl_addr += 0x8000; - pen_bg1[0] = pens[m_pal_ind16[(m_cont_reg[7]&0x03)]]; - pen_bg0[0] = pens[m_pal_ind16[((m_cont_reg[7]>>2)&0x03)]]; + pen_bg1[0] = this->pen(m_pal_ind16[m_cont_reg[7] & 0x03]); + pen_bg0[0] = this->pen(m_pal_ind16[(m_cont_reg[7] >> 2) & 0x03]); xx = m_offset_x; while (xx--) { *ln++ = pen_bg0[0]; *ln++ = pen_bg1[0]; } @@ -1252,8 +1252,8 @@ void v99x8_device::mode_graphic5(const pen_t *pens, uint16_t *ln, int line) for (;x<4;x++) { - pen_bg0[x] = pens[m_pal_ind16[x]]; - pen_bg1[x] = pens[m_pal_ind16[x]]; + pen_bg0[x] = this->pen(m_pal_ind16[x]); + pen_bg1[x] = this->pen(m_pal_ind16[x]); } for (x=0;x<128;x++) @@ -1266,18 +1266,18 @@ void v99x8_device::mode_graphic5(const pen_t *pens, uint16_t *ln, int line) *ln++ = pen_bg1[(colour&3)]; } - pen_bg1[0] = pens[m_pal_ind16[(m_cont_reg[7]&0x03)]]; - pen_bg0[0] = pens[m_pal_ind16[((m_cont_reg[7]>>2)&0x03)]]; + pen_bg1[0] = this->pen(m_pal_ind16[m_cont_reg[7] & 0x03]); + pen_bg0[0] = this->pen(m_pal_ind16[(m_cont_reg[7] >> 2) & 0x03]); xx = 16 - m_offset_x; while (xx--) { *ln++ = pen_bg0[0]; *ln++ = pen_bg1[0]; } } -void v99x8_device::mode_graphic6(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_graphic6(uint16_t *ln, int line) { uint8_t colour; int line2, linemask, x, xx, nametbl_addr; - uint16_t pen_bg, fg0; - uint16_t fg1; + pen_t pen_bg, fg0; + pen_t fg1; linemask = ((m_cont_reg[2] & 0x1f) << 3) | 7; @@ -1287,7 +1287,7 @@ void v99x8_device::mode_graphic6(const pen_t *pens, uint16_t *ln, int line) if ( (m_cont_reg[2] & 0x20) && v9938_second_field() ) nametbl_addr += 0x10000; - pen_bg = pens[m_pal_ind16[(m_cont_reg[7]&0x0f)]]; + pen_bg = pen(m_pal_ind16[m_cont_reg[7] & 0x0f]); xx = m_offset_x * 2; while (xx--) *ln++ = pen_bg; @@ -1297,8 +1297,8 @@ void v99x8_device::mode_graphic6(const pen_t *pens, uint16_t *ln, int line) { nametbl_addr++; colour = m_vram_space->read_byte(((nametbl_addr&1) << 16) | (nametbl_addr>>1)); - fg0 = pens[m_pal_ind16[colour>>4]]; - fg1 = pens[m_pal_ind16[colour&15]]; + fg0 = pen(m_pal_ind16[colour >> 4]); + fg1 = pen(m_pal_ind16[colour & 15]); *ln++ = fg0; *ln++ = fg1; *ln++ = fg0; *ln++ = fg1; *ln++ = fg0; *ln++ = fg1; *ln++ = fg0; *ln++ = fg1; *ln++ = fg0; *ln++ = fg1; *ln++ = fg0; *ln++ = fg1; @@ -1311,8 +1311,8 @@ void v99x8_device::mode_graphic6(const pen_t *pens, uint16_t *ln, int line) for (x=0;x<256;x++) { colour = m_vram_space->read_byte(((nametbl_addr&1) << 16) | (nametbl_addr>>1)); - *ln++ = pens[m_pal_ind16[colour>>4]]; - *ln++ = pens[m_pal_ind16[colour&15]]; + *ln++ = pen(m_pal_ind16[colour >> 4]); + *ln++ = pen(m_pal_ind16[colour & 15]); nametbl_addr++; } } @@ -1321,11 +1321,11 @@ void v99x8_device::mode_graphic6(const pen_t *pens, uint16_t *ln, int line) while (xx--) *ln++ = pen_bg; } -void v99x8_device::mode_graphic7(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_graphic7(uint16_t *ln, int line) { uint8_t colour; int line2, linemask, x, xx, nametbl_addr; - uint16_t pen, pen_bg; + pen_t pen, pen_bg; linemask = ((m_cont_reg[2] & 0x1f) << 3) | 7; @@ -1335,7 +1335,7 @@ void v99x8_device::mode_graphic7(const pen_t *pens, uint16_t *ln, int line) if ( (m_cont_reg[2] & 0x20) && v9938_second_field() ) nametbl_addr += 0x10000; - pen_bg = pens[m_pal_ind256[m_cont_reg[7]]]; + pen_bg = this->pen(m_pal_ind256[m_cont_reg[7]]); xx = m_offset_x * 2; while (xx--) *ln++ = pen_bg; @@ -1411,7 +1411,7 @@ void v99x8_device::mode_graphic7(const pen_t *pens, uint16_t *ln, int line) { nametbl_addr++; colour = m_vram_space->read_byte(((nametbl_addr&1) << 16) | (nametbl_addr>>1)); - pen = pens[m_pal_ind256[colour]]; + pen = this->pen(m_pal_ind256[colour]); *ln++ = pen; *ln++ = pen; *ln++ = pen; *ln++ = pen; *ln++ = pen; *ln++ = pen; @@ -1428,7 +1428,7 @@ void v99x8_device::mode_graphic7(const pen_t *pens, uint16_t *ln, int line) for (x=0;x<256;x++) { colour = m_vram_space->read_byte(((nametbl_addr&1) << 16) | (nametbl_addr>>1)); - pen = pens[m_pal_ind256[colour]]; + pen = this->pen(m_pal_ind256[colour]); *ln++ = pen; *ln++ = pen; nametbl_addr++; @@ -1439,13 +1439,13 @@ void v99x8_device::mode_graphic7(const pen_t *pens, uint16_t *ln, int line) while (xx--) *ln++ = pen_bg; } -void v99x8_device::mode_unknown(const pen_t *pens, uint16_t *ln, int line) +void v99x8_device::mode_unknown(uint16_t *ln, int line) { - uint16_t fg, bg; + pen_t fg, bg; int x; - fg = pens[m_pal_ind16[m_cont_reg[7] >> 4]]; - bg = pens[m_pal_ind16[m_cont_reg[7] & 15]]; + fg = pen(m_pal_ind16[m_cont_reg[7] >> 4]); + bg = pen(m_pal_ind16[m_cont_reg[7] & 15]); x = m_offset_x * 2; while (x--) *ln++ = bg; @@ -1457,7 +1457,7 @@ void v99x8_device::mode_unknown(const pen_t *pens, uint16_t *ln, int line) while (x--) *ln++ = bg; } -void v99x8_device::default_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t *col) +void v99x8_device::default_draw_sprite(uint16_t *ln, uint8_t *col) { int i; ln += m_offset_x * 2; @@ -1466,8 +1466,8 @@ void v99x8_device::default_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t { if (col[i] & 0x80) { - *ln++ = pens[m_pal_ind16[col[i]&0x0f]]; - *ln++ = pens[m_pal_ind16[col[i]&0x0f]]; + *ln++ = pen(m_pal_ind16[col[i] & 0x0f]); + *ln++ = pen(m_pal_ind16[col[i] & 0x0f]); } else { @@ -1476,7 +1476,7 @@ void v99x8_device::default_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t } } -void v99x8_device::graphic5_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t *col) +void v99x8_device::graphic5_draw_sprite(uint16_t *ln, uint8_t *col) { int i; ln += m_offset_x * 2; @@ -1485,8 +1485,8 @@ void v99x8_device::graphic5_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t { if (col[i] & 0x80) { - *ln++ = pens[m_pal_ind16[(col[i]>>2)&0x03]]; - *ln++ = pens[m_pal_ind16[col[i]&0x03]]; + *ln++ = pen(m_pal_ind16[(col[i] >> 2) & 0x03]); + *ln++ = pen(m_pal_ind16[col[i] & 0x03]); } else { @@ -1496,7 +1496,7 @@ void v99x8_device::graphic5_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t } -void v99x8_device::graphic7_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t *col) +void v99x8_device::graphic7_draw_sprite(uint16_t *ln, uint8_t *col) { static const uint16_t g7_ind16[16] = { 0, 2, 192, 194, 48, 50, 240, 242, @@ -1509,8 +1509,8 @@ void v99x8_device::graphic7_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t { if (col[i] & 0x80) { - *ln++ = pens[g7_ind16[col[i]&0x0f]]; - *ln++ = pens[g7_ind16[col[i]&0x0f]]; + *ln++ = pen(g7_ind16[col[i] & 0x0f]); + *ln++ = pen(g7_ind16[col[i] & 0x0f]); } else { @@ -1871,15 +1871,15 @@ void v99x8_device::refresh_16(int line) if ( !(m_cont_reg[1] & 0x40) || (m_stat_reg[2] & 0x40) ) { - (this->*s_modes[m_mode].border_16)(pens(), ln); + (this->*s_modes[m_mode].border_16)(ln); } else { - (this->*s_modes[m_mode].visible_16)(pens(), ln, line); + (this->*s_modes[m_mode].visible_16)(ln, line); if (s_modes[m_mode].sprites) { (this->*s_modes[m_mode].sprites)(line, col); - (this->*s_modes[m_mode].draw_sprite_16)(pens(), ln, col); + (this->*s_modes[m_mode].draw_sprite_16)(ln, col); } } diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h index 2e7efa60677..062f76cf7de 100644 --- a/src/devices/video/v9938.h +++ b/src/devices/video/v9938.h @@ -148,24 +148,24 @@ private: void check_int(); void register_write(int reg, int data); - void default_border(const pen_t *pens, uint16_t *ln); - void graphic7_border(const pen_t *pens, uint16_t *ln); - void graphic5_border(const pen_t *pens, uint16_t *ln); - void mode_text1(const pen_t *pens, uint16_t *ln, int line); - void mode_text2(const pen_t *pens, uint16_t *ln, int line); - void mode_multi(const pen_t *pens, uint16_t *ln, int line); - void mode_graphic1(const pen_t *pens, uint16_t *ln, int line); - void mode_graphic23(const pen_t *pens, uint16_t *ln, int line); - void mode_graphic4(const pen_t *pens, uint16_t *ln, int line); - void mode_graphic5(const pen_t *pens, uint16_t *ln, int line); - void mode_graphic6(const pen_t *pens, uint16_t *ln, int line); - void mode_graphic7(const pen_t *pens, uint16_t *ln, int line); -// template void mode_yae(const pen_t *pens, _PixelType *ln, int line); -// template void mode_yjk(const pen_t *pens, _PixelType *ln, int line); - void mode_unknown(const pen_t *pens, uint16_t *ln, int line); - void default_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t *col); - void graphic5_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t *col); - void graphic7_draw_sprite(const pen_t *pens, uint16_t *ln, uint8_t *col); + void default_border(uint16_t *ln); + void graphic7_border(uint16_t *ln); + void graphic5_border(uint16_t *ln); + void mode_text1(uint16_t *ln, int line); + void mode_text2(uint16_t *ln, int line); + void mode_multi(uint16_t *ln, int line); + void mode_graphic1(uint16_t *ln, int line); + void mode_graphic23(uint16_t *ln, int line); + void mode_graphic4(uint16_t *ln, int line); + void mode_graphic5(uint16_t *ln, int line); + void mode_graphic6(uint16_t *ln, int line); + void mode_graphic7(uint16_t *ln, int line); +// template void mode_yae(_PixelType *ln, int line); +// template void mode_yjk(_PixelType *ln, int line); + void mode_unknown(uint16_t *ln, int line); + void default_draw_sprite(uint16_t *ln, uint8_t *col); + void graphic5_draw_sprite(uint16_t *ln, uint8_t *col); + void graphic7_draw_sprite(uint16_t *ln, uint8_t *col); void sprite_mode1(int line, uint8_t *col); void sprite_mode2(int line, uint8_t *col); @@ -260,10 +260,10 @@ private: struct v99x8_mode { uint8_t m; - void (v99x8_device::*visible_16)(const pen_t *, uint16_t*, int); - void (v99x8_device::*border_16)(const pen_t *, uint16_t*); + void (v99x8_device::*visible_16)(uint16_t*, int); + void (v99x8_device::*border_16)(uint16_t*); void (v99x8_device::*sprites)(int, uint8_t*); - void (v99x8_device::*draw_sprite_16)(const pen_t *, uint16_t*, uint8_t*); + void (v99x8_device::*draw_sprite_16)(uint16_t*, uint8_t*); } ; static const v99x8_mode s_modes[]; emu_timer *m_line_timer; -- cgit v1.2.3