diff options
author | Aaron Giles <aaron@aarongiles.com> | 2014-02-18 08:05:44 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2014-02-18 08:05:44 +0000 |
commit | 3e2995cbba04d05365e28c52e743ceed8981a5cf (patch) | |
tree | 56bfadb6768b2a2f284387f382c13bed41824d5e /src/mess/video | |
parent | 847cecbadc820d12e1e7816bfcbb45f931a5f0e1 (diff) |
Converted palette_t and palette_client to classes. General palette.c
cleanup.
Diffstat (limited to 'src/mess/video')
-rw-r--r-- | src/mess/video/bbc.c | 2 | ||||
-rw-r--r-- | src/mess/video/dgn_beta.c | 2 | ||||
-rw-r--r-- | src/mess/video/ef9345.c | 4 | ||||
-rw-r--r-- | src/mess/video/isa_cga.c | 24 | ||||
-rw-r--r-- | src/mess/video/isa_mda.c | 6 | ||||
-rw-r--r-- | src/mess/video/kaypro.c | 2 | ||||
-rw-r--r-- | src/mess/video/mbc55x.c | 2 | ||||
-rw-r--r-- | src/mess/video/mbee.c | 6 | ||||
-rw-r--r-- | src/mess/video/pc_aga.c | 20 | ||||
-rw-r--r-- | src/mess/video/pc_t1t.c | 16 | ||||
-rw-r--r-- | src/mess/video/poisk1.c | 6 | ||||
-rw-r--r-- | src/mess/video/radio86.c | 8 | ||||
-rw-r--r-- | src/mess/video/super80.c | 2 |
13 files changed, 50 insertions, 50 deletions
diff --git a/src/mess/video/bbc.c b/src/mess/video/bbc.c index b0d902363f1..37d21946ba9 100644 --- a/src/mess/video/bbc.c +++ b/src/mess/video/bbc.c @@ -165,7 +165,7 @@ WRITE8_MEMBER(bbc_state::bbc_videoULA_w) static MC6845_UPDATE_ROW( vid_update_row ) { bbc_state *state = device->machine().driver_data<bbc_state>(); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); if (state->m_videoULA_teletext_normal_select) { diff --git a/src/mess/video/dgn_beta.c b/src/mess/video/dgn_beta.c index 96f6d58ff5b..6cb4d653b3c 100644 --- a/src/mess/video/dgn_beta.c +++ b/src/mess/video/dgn_beta.c @@ -99,7 +99,7 @@ the access to the video memory is unclear to me at the moment. static MC6845_UPDATE_ROW( dgnbeta_update_row ) { dgn_beta_state *state = device->machine().driver_data<dgn_beta_state>(); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 *videoram = state->m_videoram; UINT32 *p = &bitmap.pix32(y); int i; diff --git a/src/mess/video/ef9345.c b/src/mess/video/ef9345.c index adc62c6e56d..abb84049a49 100644 --- a/src/mess/video/ef9345.c +++ b/src/mess/video/ef9345.c @@ -206,7 +206,7 @@ void ef9345_device::draw_char_40(UINT8 *c, UINT16 x, UINT16 y) if (y * 10 >= m_screen->height() || x * 8 >= m_screen->width()) return; - const rgb_t *palette = palette_entry_list_raw(m_screen_out.palette()); + const rgb_t *palette = m_screen_out.palette()->entry_list_raw(); for(int i = 0; i < 10; i++) for(int j = 0; j < 8; j++) m_screen_out.pix32(y * 10 + i, x * 8 + j) = palette[c[8 * i + j] & 0x07]; @@ -219,7 +219,7 @@ void ef9345_device::draw_char_80(UINT8 *c, UINT16 x, UINT16 y) if (y * 10 >= m_screen->height() || x * 6 >= m_screen->width()) return; - const rgb_t *palette = palette_entry_list_raw(m_screen_out.palette()); + const rgb_t *palette = m_screen_out.palette()->entry_list_raw(); for(int i = 0; i < 10; i++) for(int j = 0; j < 6; j++) m_screen_out.pix32(y * 10 + i, x * 6 + j) = palette[c[6 * i + j] & 0x07]; diff --git a/src/mess/video/isa_cga.c b/src/mess/video/isa_cga.c index 2ab2f89a1af..f8e6e619bef 100644 --- a/src/mess/video/isa_cga.c +++ b/src/mess/video/isa_cga.c @@ -841,7 +841,7 @@ static MC6845_UPDATE_ROW( cga_text_inten_update_row ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); int i; running_machine &machine = device->machine(); @@ -882,7 +882,7 @@ static MC6845_UPDATE_ROW( cga_text_inten_comp_grey_update_row ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); int i; running_machine &machine = device->machine(); @@ -922,7 +922,7 @@ static MC6845_UPDATE_ROW( cga_text_inten_alt_update_row ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); int i; running_machine &machine = device->machine(); @@ -962,7 +962,7 @@ static MC6845_UPDATE_ROW( cga_text_blink_update_row ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); int i; running_machine &machine = device->machine(); @@ -1007,7 +1007,7 @@ static MC6845_UPDATE_ROW( cga_text_blink_update_row_si ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); int i; running_machine &machine = device->machine(); @@ -1060,7 +1060,7 @@ static MC6845_UPDATE_ROW( cga_text_blink_alt_update_row ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); int i; running_machine &machine = device->machine(); @@ -1109,7 +1109,7 @@ static MC6845_UPDATE_ROW( cga_gfx_4bppl_update_row ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); int i; running_machine &machine = device->machine(); @@ -1168,7 +1168,7 @@ static MC6845_UPDATE_ROW( cga_gfx_4bpph_update_row ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); int i; running_machine &machine = device->machine(); @@ -1213,7 +1213,7 @@ static MC6845_UPDATE_ROW( cga_gfx_2bpp_update_row ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); int i; running_machine &machine = device->machine(); @@ -1250,7 +1250,7 @@ static MC6845_UPDATE_ROW( cga_gfx_1bpp_update_row ) isa8_cga_device *cga = downcast<isa8_cga_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 fg = cga->m_color_select & 0x0F; int i; running_machine &machine = device->machine(); @@ -1720,7 +1720,7 @@ static MC6845_UPDATE_ROW( pc1512_gfx_4bpp_update_row ) isa8_cga_pc1512_device *cga = downcast<isa8_cga_pc1512_device *>(device->owner()); UINT8 *videoram = cga->m_vram + cga->m_start_offset; UINT32 *p = &bitmap.pix32(y); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT16 offset_base = ra << 13; int j; running_machine &machine = device->machine(); @@ -2084,7 +2084,7 @@ void isa8_wyse700_device::device_reset() UINT32 isa8_wyse700_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { if (m_control & 0x08) { - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 fg = m_color_select & 0x0F; UINT32 addr = 0; for (int y = 0; y < 800; y++) { diff --git a/src/mess/video/isa_mda.c b/src/mess/video/isa_mda.c index 662901b6b0d..ad3dbc02718 100644 --- a/src/mess/video/isa_mda.c +++ b/src/mess/video/isa_mda.c @@ -211,7 +211,7 @@ void isa8_mda_device::device_reset() static MC6845_UPDATE_ROW( mda_text_inten_update_row ) { isa8_mda_device *mda = downcast<isa8_mda_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT16 chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra; int i; @@ -285,7 +285,7 @@ static MC6845_UPDATE_ROW( mda_text_inten_update_row ) static MC6845_UPDATE_ROW( mda_text_blink_update_row ) { isa8_mda_device *mda = downcast<isa8_mda_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT16 chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra; int i; @@ -608,7 +608,7 @@ void isa8_hercules_device::device_reset() static MC6845_UPDATE_ROW( hercules_gfx_update_row ) { isa8_hercules_device *herc = downcast<isa8_hercules_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT16 gfx_base = ( ( herc->m_mode_control & 0x80 ) ? 0x8000 : 0x0000 ) | ( ( ra & 0x03 ) << 13 ); int i; diff --git a/src/mess/video/kaypro.c b/src/mess/video/kaypro.c index e1a0925c25b..56e50c36971 100644 --- a/src/mess/video/kaypro.c +++ b/src/mess/video/kaypro.c @@ -137,7 +137,7 @@ UINT32 kaypro_state::screen_update_kaypro2x(screen_device &screen, bitmap_rgb32 MC6845_UPDATE_ROW( kaypro2x_update_row ) { kaypro_state *state = device->machine().driver_data<kaypro_state>(); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT16 x; UINT8 gfx,fg,bg; diff --git a/src/mess/video/mbc55x.c b/src/mess/video/mbc55x.c index f8ba1646970..75843e7985b 100644 --- a/src/mess/video/mbc55x.c +++ b/src/mess/video/mbc55x.c @@ -90,7 +90,7 @@ static void video_debug(running_machine &machine, int ref, int params, const cha static MC6845_UPDATE_ROW( vid_update_row ) { mbc55x_state *mstate = device->machine().driver_data<mbc55x_state>(); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 *ram = &mstate->m_ram->pointer()[0]; UINT8 *red = &mstate->m_video_mem[RED_PLANE_OFFSET]; diff --git a/src/mess/video/mbee.c b/src/mess/video/mbee.c index c7ec078323e..29f55d311c5 100644 --- a/src/mess/video/mbee.c +++ b/src/mess/video/mbee.c @@ -419,7 +419,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED( mbee256_update_addr ) MC6845_UPDATE_ROW( mbee_update_row ) { mbee_state *state = device->machine().driver_data<mbee_state>(); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 chr,gfx; UINT16 mem,x; UINT32 *p = &bitmap.pix32(y); @@ -458,7 +458,7 @@ MC6845_UPDATE_ROW( mbee_update_row ) MC6845_UPDATE_ROW( mbeeic_update_row ) { mbee_state *state = device->machine().driver_data<mbee_state>(); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 chr,gfx,fg,bg; UINT16 mem,x,col; UINT16 colourm = (state->m_08 & 0x0e) << 7; @@ -502,7 +502,7 @@ MC6845_UPDATE_ROW( mbeeic_update_row ) MC6845_UPDATE_ROW( mbeeppc_update_row ) { mbee_state *state = device->machine().driver_data<mbee_state>(); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 gfx,fg,bg; UINT16 mem,x,col,chr; UINT32 *p = &bitmap.pix32(y); diff --git a/src/mess/video/pc_aga.c b/src/mess/video/pc_aga.c index 46baa88ad50..7ca4d933690 100644 --- a/src/mess/video/pc_aga.c +++ b/src/mess/video/pc_aga.c @@ -124,7 +124,7 @@ static WRITE_LINE_DEVICE_HANDLER( aga_vsync_changed ) { /* colors need fixing in the mda_text_* functions ! */ static MC6845_UPDATE_ROW( mda_text_inten_update_row ) { - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 *videoram = aga.videoram; UINT32 *p = &bitmap.pix32(y); UINT16 chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra; @@ -185,7 +185,7 @@ static MC6845_UPDATE_ROW( mda_text_inten_update_row ) { static MC6845_UPDATE_ROW( mda_text_blink_update_row ) { UINT8 *videoram = aga.videoram; - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT16 chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra; int i; @@ -246,7 +246,7 @@ static MC6845_UPDATE_ROW( mda_text_blink_update_row ) { static MC6845_UPDATE_ROW( cga_text_inten_update_row ) { UINT8 *videoram = aga.videoram; - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); int i; @@ -275,7 +275,7 @@ static MC6845_UPDATE_ROW( cga_text_inten_update_row ) { } static MC6845_UPDATE_ROW( cga_text_inten_alt_update_row ) { - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 *videoram = aga.videoram; UINT32 *p = &bitmap.pix32(y); int i; @@ -304,7 +304,7 @@ static MC6845_UPDATE_ROW( cga_text_inten_alt_update_row ) { } static MC6845_UPDATE_ROW( cga_text_blink_update_row ) { - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 *videoram = aga.videoram; UINT32 *p = &bitmap.pix32(y); int i; @@ -337,7 +337,7 @@ static MC6845_UPDATE_ROW( cga_text_blink_update_row ) { } static MC6845_UPDATE_ROW( cga_text_blink_alt_update_row ) { - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 *videoram = aga.videoram; UINT32 *p = &bitmap.pix32(y); int i; @@ -372,7 +372,7 @@ static MC6845_UPDATE_ROW( cga_text_blink_alt_update_row ) { } static MC6845_UPDATE_ROW( cga_gfx_4bppl_update_row ) { - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 *videoram = aga.videoram; UINT32 *p = &bitmap.pix32(y); int i; @@ -398,7 +398,7 @@ static MC6845_UPDATE_ROW( cga_gfx_4bppl_update_row ) { static MC6845_UPDATE_ROW( cga_gfx_4bpph_update_row ) { UINT8 *videoram = aga.videoram; - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); int i; @@ -431,7 +431,7 @@ static MC6845_UPDATE_ROW( cga_gfx_4bpph_update_row ) { static MC6845_UPDATE_ROW( cga_gfx_2bpp_update_row ) { UINT8 *videoram = aga.videoram; - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); int i; @@ -456,7 +456,7 @@ static MC6845_UPDATE_ROW( cga_gfx_2bpp_update_row ) { static MC6845_UPDATE_ROW( cga_gfx_1bpp_update_row ) { UINT8 *videoram = aga.videoram; - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT8 fg = aga.cga_color_select & 0x0F; int i; diff --git a/src/mess/video/pc_t1t.c b/src/mess/video/pc_t1t.c index a3d65e8fdb8..ad8cd12b47d 100644 --- a/src/mess/video/pc_t1t.c +++ b/src/mess/video/pc_t1t.c @@ -182,7 +182,7 @@ PALETTE_INIT_MEMBER( pc_t1t_device, pcjr ) static MC6845_UPDATE_ROW( t1000_text_inten_update_row ) { pc_t1t_device *t1t = downcast<pc_t1t_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); int i; @@ -216,7 +216,7 @@ static MC6845_UPDATE_ROW( t1000_text_inten_update_row ) static MC6845_UPDATE_ROW( t1000_text_blink_update_row ) { pc_t1t_device *t1t = downcast<pc_t1t_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); int i; @@ -258,7 +258,7 @@ static MC6845_UPDATE_ROW( t1000_text_blink_update_row ) static MC6845_UPDATE_ROW( pcjx_text_update_row ) { pcvideo_pcjr_device *pcjx = downcast<pcvideo_pcjr_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); int i; @@ -300,7 +300,7 @@ static MC6845_UPDATE_ROW( pcjx_text_update_row ) static MC6845_UPDATE_ROW( t1000_gfx_4bpp_update_row ) { pc_t1t_device *t1t = downcast<pc_t1t_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT8 *vid = t1t->m_displayram + ( ra << 13 ); int i; @@ -328,7 +328,7 @@ static MC6845_UPDATE_ROW( t1000_gfx_4bpp_update_row ) static MC6845_UPDATE_ROW( t1000_gfx_2bpp_update_row ) { pc_t1t_device *t1t = downcast<pc_t1t_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT8 *vid = t1t->m_displayram + ( ra << 13 ); int i; @@ -356,7 +356,7 @@ static MC6845_UPDATE_ROW( t1000_gfx_2bpp_update_row ) static MC6845_UPDATE_ROW( pcjr_gfx_2bpp_high_update_row ) { pcvideo_pcjr_device *pcjr = downcast<pcvideo_pcjr_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT8 *vid = pcjr->m_displayram + ( ra << 13 ); int i; @@ -382,7 +382,7 @@ static MC6845_UPDATE_ROW( pcjr_gfx_2bpp_high_update_row ) static MC6845_UPDATE_ROW( t1000_gfx_2bpp_tga_update_row ) { pc_t1t_device *t1t = downcast<pc_t1t_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT8 *vid = t1t->m_displayram + ( ra << 13 ); int i; @@ -410,7 +410,7 @@ static MC6845_UPDATE_ROW( t1000_gfx_2bpp_tga_update_row ) static MC6845_UPDATE_ROW( t1000_gfx_1bpp_update_row ) { pc_t1t_device *t1t = downcast<pc_t1t_device *>(device->owner()); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(y); UINT8 *vid = t1t->m_displayram + ( ra << 13 ); UINT8 fg = t1t->m_palette_base + t1t->m_reg.data[0x11]; diff --git a/src/mess/video/poisk1.c b/src/mess/video/poisk1.c index 4ba28ee83b0..f7c6b5bd6dc 100644 --- a/src/mess/video/poisk1.c +++ b/src/mess/video/poisk1.c @@ -184,7 +184,7 @@ void p1_state::set_palette_luts(void) POISK1_UPDATE_ROW( p1_state::cga_gfx_2bpp_update_row ) { - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(ra); UINT16 odd, offset; int i; @@ -211,7 +211,7 @@ POISK1_UPDATE_ROW( p1_state::cga_gfx_2bpp_update_row ) POISK1_UPDATE_ROW( p1_state::cga_gfx_1bpp_update_row ) { - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(ra); UINT8 fg = 15, bg = BG_COLOR(m_video.color_select_68); UINT16 odd, offset; @@ -243,7 +243,7 @@ POISK1_UPDATE_ROW( p1_state::cga_gfx_1bpp_update_row ) POISK1_UPDATE_ROW( p1_state::poisk1_gfx_1bpp_update_row ) { - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT32 *p = &bitmap.pix32(ra); UINT8 fg, bg = BG_COLOR(m_video.color_select_68); UINT16 odd, offset; diff --git a/src/mess/video/radio86.c b/src/mess/video/radio86.c index 50523c8c28d..26fc4e1d092 100644 --- a/src/mess/video/radio86.c +++ b/src/mess/video/radio86.c @@ -15,7 +15,7 @@ I8275_DISPLAY_PIXELS(radio86_display_pixels) { radio86_state *state = device->machine().driver_data<radio86_state>(); int i; - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); const UINT8 *charmap = state->m_charmap; UINT8 pixels = charmap[(linecount & 7) + (charcode << 3)] ^ 0xff; if (vsp) { @@ -37,7 +37,7 @@ I8275_DISPLAY_PIXELS(mikrosha_display_pixels) { radio86_state *state = device->machine().driver_data<radio86_state>(); int i; - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); const UINT8 *charmap = state->m_charmap + (state->m_mikrosha_font_page & 1) * 0x400; UINT8 pixels = charmap[(linecount & 7) + (charcode << 3)] ^ 0xff; if (vsp) { @@ -58,7 +58,7 @@ I8275_DISPLAY_PIXELS(apogee_display_pixels) { radio86_state *state = device->machine().driver_data<radio86_state>(); int i; - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); const UINT8 *charmap = state->m_charmap + (gpa & 1) * 0x400; UINT8 pixels = charmap[(linecount & 7) + (charcode << 3)] ^ 0xff; if (vsp) { @@ -79,7 +79,7 @@ I8275_DISPLAY_PIXELS(partner_display_pixels) { radio86_state *state = device->machine().driver_data<radio86_state>(); int i; - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); const UINT8 *charmap = state->m_charmap + 0x400 * (gpa * 2 + hlgt); UINT8 pixels = charmap[(linecount & 7) + (charcode << 3)] ^ 0xff; if (vsp) { diff --git a/src/mess/video/super80.c b/src/mess/video/super80.c index 54aefacf773..7c530455546 100644 --- a/src/mess/video/super80.c +++ b/src/mess/video/super80.c @@ -389,7 +389,7 @@ UINT32 super80_state::screen_update_super80v(screen_device &screen, bitmap_rgb32 MC6845_UPDATE_ROW( super80v_update_row ) { super80_state *state = device->machine().driver_data<super80_state>(); - const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); + const rgb_t *palette = bitmap.palette()->entry_list_raw(); UINT8 chr,col,gfx,fg,bg=0; UINT16 mem,x; UINT32 *p = &bitmap.pix32(y); |