From db8e8824dbebaf28e2003741d64041696468bde8 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Sun, 15 Jan 2012 07:48:20 +0000 Subject: [PATCH] Misc regression fixes (thanks, Tafoid) --- src/emu/screen.h | 6 +++--- src/emu/tilemap.c | 4 ++-- src/mame/drivers/bfm_swp.c | 2 +- src/mame/drivers/thayers.c | 2 +- src/mame/video/stvvdp2.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/emu/screen.h b/src/emu/screen.h index dbd8ac40693..9b9def655df 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -83,9 +83,9 @@ private: public: // construction/destruction screen_bitmap() - : m_format(BITMAP_FORMAT_INVALID), - m_texformat(TEXFORMAT_UNDEFINED), - m_live(NULL) { } + : m_format(BITMAP_FORMAT_RGB32), + m_texformat(TEXFORMAT_RGB32), + m_live(&m_rgb32) { } screen_bitmap(bitmap_ind16 &orig) : m_format(BITMAP_FORMAT_IND16), m_texformat(TEXFORMAT_PALETTE16), diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index 2c07acc7379..ae841509e1c 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -1674,7 +1674,7 @@ static void tilemap_draw_instance(_BitmapClass &dest, tilemap_t *tmap, const bli { for (cury = y; cury < nexty; cury++) { - if (dest0 == NULL) + if (dest_baseaddr == NULL) scanline_draw_opaque_null(x_end - x_start, pmap0, blit->tilemap_priority_code); else if (sizeof(*dest0) == 2) scanline_draw_opaque_ind16(reinterpret_cast(dest0), source0, x_end - x_start, pmap0, blit->tilemap_priority_code); @@ -1695,7 +1695,7 @@ static void tilemap_draw_instance(_BitmapClass &dest, tilemap_t *tmap, const bli const UINT8 *mask0 = mask_baseaddr + x_start; for (cury = y; cury < nexty; cury++) { - if (dest0 == NULL) + if (dest_baseaddr == NULL) scanline_draw_masked_null(mask0, blit->mask, blit->value, x_end - x_start, pmap0, blit->tilemap_priority_code); else if (sizeof(*dest0) == 2) scanline_draw_masked_ind16(reinterpret_cast(dest0), source0, mask0, blit->mask, blit->value, x_end - x_start, pmap0, blit->tilemap_priority_code); diff --git a/src/mame/drivers/bfm_swp.c b/src/mame/drivers/bfm_swp.c index 6576568e839..dc173babe84 100644 --- a/src/mame/drivers/bfm_swp.c +++ b/src/mame/drivers/bfm_swp.c @@ -130,7 +130,7 @@ public: bfm_swp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) + UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; } diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c index 716e579fd1a..87e3fb57a62 100644 --- a/src/mame/drivers/thayers.c +++ b/src/mame/drivers/thayers.c @@ -38,7 +38,7 @@ public: thayers_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_pr7820(*this, "laserdisc"), - m_ldv1000(*this, "laserdisc") { } + m_ldv1000(*this, "ldv1000") { } optional_device m_pr7820; optional_device m_ldv1000; diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index bfcabeaae3e..61106fcc318 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -5921,7 +5921,7 @@ static int stv_vdp2_start (running_machine &machine) VIDEO_START( stv_vdp2 ) { saturn_state *state = machine.driver_data(); - state->m_tmpbitmap.allocate(704, 256); + machine.primary_screen->register_screen_bitmap(state->m_tmpbitmap); stv_vdp2_start(machine); stv_vdp1_start(machine); debug.l_en = 0xff;