summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/mario.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/mario.cpp')
-rw-r--r--src/mame/video/mario.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mame/video/mario.cpp b/src/mame/video/mario.cpp
index 0c94f827f0b..9619a59bc3e 100644
--- a/src/mame/video/mario.cpp
+++ b/src/mame/video/mario.cpp
@@ -64,15 +64,15 @@ static const res_net_info mario_net_info_std =
bit 0 -- 470 ohm resistor -- inverter -- BLUE
***************************************************************************/
-PALETTE_INIT_MEMBER(mario_state, mario)
+void mario_state::mario_palette(palette_device &palette) const
{
- const uint8_t *color_prom = memregion("proms")->base();
- std::vector<rgb_t> rgb;
+ uint8_t const *const color_prom = memregion("proms")->base();
+ std::vector<rgb_t> rgb;
if (m_monitor == 0)
compute_res_net_all(rgb, color_prom, mario_decode_info, mario_net_info);
else
- compute_res_net_all(rgb, color_prom+256, mario_decode_info, mario_net_info_std);
+ compute_res_net_all(rgb, color_prom + 256, mario_decode_info, mario_net_info_std);
palette.set_pen_colors(0, rgb);
palette.palette()->normalize_range(0, 255);
@@ -212,13 +212,11 @@ void mario_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
uint32_t mario_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- int t;
-
- t = ioport("MONITOR")->read();
+ int const t = ioport("MONITOR")->read();
if (t != m_monitor)
{
m_monitor = t;
- PALETTE_INIT_NAME(mario)(*m_palette);
+ mario_palette(*m_palette);
}
m_bg_tilemap->set_scrolly(0, m_gfx_scroll);