Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc regression fixes (thanks, Tafoid)

Browse Source
This commit is contained in:
Aaron Giles 2012-01-15 07:48:20 +00:00
parent 07b34b0156
commit db8e8824db
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/screen.h
View File

@ -83,9 +83,9 @@ private:
public: public:
// construction/destruction // construction/destruction
screen_bitmap() screen_bitmap()
: m_format(BITMAP_FORMAT_INVALID), : m_format(BITMAP_FORMAT_RGB32),
m_texformat(TEXFORMAT_UNDEFINED), m_texformat(TEXFORMAT_RGB32),
m_live(NULL) { } m_live(&m_rgb32) { }
screen_bitmap(bitmap_ind16 &orig) screen_bitmap(bitmap_ind16 &orig)
: m_format(BITMAP_FORMAT_IND16), : m_format(BITMAP_FORMAT_IND16),
m_texformat(TEXFORMAT_PALETTE16), m_texformat(TEXFORMAT_PALETTE16),

4
src/emu/tilemap.c
View File

@ -1674,7 +1674,7 @@ static void tilemap_draw_instance(_BitmapClass &dest, tilemap_t *tmap, const bli
{ {
for (cury = y; cury < nexty; cury++) 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); scanline_draw_opaque_null(x_end - x_start, pmap0, blit->tilemap_priority_code);
else if (sizeof(*dest0) == 2) else if (sizeof(*dest0) == 2)
scanline_draw_opaque_ind16(reinterpret_cast<UINT16 *>(dest0), source0, x_end - x_start, pmap0, blit->tilemap_priority_code); scanline_draw_opaque_ind16(reinterpret_cast<UINT16 *>(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; const UINT8 *mask0 = mask_baseaddr + x_start;
for (cury = y; cury < nexty; cury++) 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); scanline_draw_masked_null(mask0, blit->mask, blit->value, x_end - x_start, pmap0, blit->tilemap_priority_code);
else if (sizeof(*dest0) == 2) else if (sizeof(*dest0) == 2)
scanline_draw_masked_ind16(reinterpret_cast<UINT16 *>(dest0), source0, mask0, blit->mask, blit->value, x_end - x_start, pmap0, blit->tilemap_priority_code); scanline_draw_masked_ind16(reinterpret_cast<UINT16 *>(dest0), source0, mask0, blit->mask, blit->value, x_end - x_start, pmap0, blit->tilemap_priority_code);

2
src/mame/drivers/bfm_swp.c
View File

@ -130,7 +130,7 @@ public:
bfm_swp_state(const machine_config &mconfig, device_type type, const char *tag) bfm_swp_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, 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; return 0;
} }

2
src/mame/drivers/thayers.c
View File

@ -38,7 +38,7 @@ public:
thayers_state(const machine_config &mconfig, device_type type, const char *tag) thayers_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag),
m_pr7820(*this, "laserdisc"), m_pr7820(*this, "laserdisc"),
m_ldv1000(*this, "laserdisc") { } m_ldv1000(*this, "ldv1000") { }
optional_device<pioneer_pr7820_device> m_pr7820; optional_device<pioneer_pr7820_device> m_pr7820;
optional_device<pioneer_ldv1000_device> m_ldv1000; optional_device<pioneer_ldv1000_device> m_ldv1000;

2
src/mame/video/stvvdp2.c
View File

@ -5921,7 +5921,7 @@ static int stv_vdp2_start (running_machine &machine)
VIDEO_START( stv_vdp2 ) VIDEO_START( stv_vdp2 )
{ {
saturn_state *state = machine.driver_data<saturn_state>(); saturn_state *state = machine.driver_data<saturn_state>();
state->m_tmpbitmap.allocate(704, 256); machine.primary_screen->register_screen_bitmap(state->m_tmpbitmap);
stv_vdp2_start(machine); stv_vdp2_start(machine);
stv_vdp1_start(machine); stv_vdp1_start(machine);
debug.l_en = 0xff; debug.l_en = 0xff;