summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/meritm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/meritm.cpp')
-rw-r--r--src/mame/drivers/meritm.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index 83ac0ab720f..c603e03e1a7 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -258,7 +258,7 @@ public:
DECLARE_MACHINE_START(meritm_crt250_crt252_crt258);
DECLARE_MACHINE_START(meritm_crt260);
DECLARE_MACHINE_START(merit_common);
- uint32_t screen_update_meritm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_meritm(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(vblank_start_tick);
TIMER_DEVICE_CALLBACK_MEMBER(vblank_end_tick);
void meritm_crt250_switch_banks( );
@@ -334,7 +334,7 @@ void meritm_state::video_start()
save_item(NAME(m_interrupt_vdp1_state));
}
-uint32_t meritm_state::screen_update_meritm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t meritm_state::screen_update_meritm(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
if(machine().input().code_pressed_once(KEYCODE_Q))
{
@@ -347,7 +347,7 @@ uint32_t meritm_state::screen_update_meritm(screen_device &screen, bitmap_ind16
popmessage("Layer 1 %sabled",m_layer1_enabled ? "en" : "dis");
}
- bitmap.fill(m_v9938_0->black_pen(), cliprect);
+ bitmap.fill(rgb_t::black(), cliprect);
if ( m_layer0_enabled )
{
@@ -356,7 +356,7 @@ uint32_t meritm_state::screen_update_meritm(screen_device &screen, bitmap_ind16
if ( m_layer1_enabled )
{
- copybitmap_trans(bitmap, m_v9938_1->get_bitmap(), 0, 0, -6, -12, cliprect, m_v9938_1->get_transpen());
+ copybitmap_transalpha(bitmap, m_v9938_1->get_bitmap(), 0, 0, -6, -12, cliprect);
}
return 0;
}