Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

crash fixes for mame (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2014-02-28 08:52:04 +00:00
parent a4d4b26a89
commit 7a908a9a84
12 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpu/tms34010/tms34010.c
View File

@ -1118,7 +1118,7 @@ UINT32 tms34010_device::tms340x0_ind16(screen_device &screen, bitmap_ind16 &bitm
UINT32 tms34010_device::tms340x0_rgb32(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
pen_t blackpen = screen.palette()->black_pen();
pen_t blackpen = rgb_t::black;
tms34010_display_params params;
tms34010_state *tms = NULL;
device_t *cpu;

3
src/emu/machine/laserdsc.c
View File

@ -819,7 +819,8 @@ void laserdisc_device::init_video()
for (int index = 0; index < ARRAY_LENGTH(m_overbitmap); index++)
{
m_overbitmap[index].set_format(format, texformat);
m_overbitmap[index].set_palette(machine().first_screen()->palette()->palette());
if (format==BITMAP_FORMAT_IND16)
m_overbitmap[index].set_palette(machine().first_screen()->palette()->palette());
m_overbitmap[index].resize(m_overwidth, m_overheight);
}

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

@ -122,7 +122,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(bishi_state::bishi_scanline)
/* compensate for a bug in the ram/rom test */
READ16_MEMBER(bishi_state::bishi_mirror_r)
{
return m_generic_paletteram_16[offset];
return m_palette->basemem().read16(offset);
}
READ16_MEMBER(bishi_state::bishi_K056832_rom_r)

1
src/mame/drivers/csplayh5.c
View File

@ -679,6 +679,7 @@ static MACHINE_CONFIG_START( csplayh5, csplayh5_state )
MCFG_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, 262*2)
MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1)
MCFG_SCREEN_UPDATE_DEVICE("v9958", v9958_device, screen_update)
MCFG_SCREEN_PALETTE("v9958:palette")
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")

1
src/mame/drivers/ggconnie.c
View File

@ -270,6 +270,7 @@ static MACHINE_CONFIG_START( ggconnie, ggconnie_state )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/3, HUC6260_WPF, 64, 64 + 1024 + 64, HUC6260_LPF, 18, 18 + 242)
MCFG_SCREEN_UPDATE_DRIVER( ggconnie_state, screen_update )
MCFG_SCREEN_PALETTE("huc6260:palette")
MCFG_HUC6260_ADD( "huc6260", PCE_MAIN_CLOCK/3, sgx_huc6260_config )
MCFG_HUC6270_ADD( "huc6270_0", sgx_huc6270_0_config )

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

@ -466,6 +466,7 @@ static MACHINE_CONFIG_START( pzlestar, sangho_state )
MCFG_SCREEN_UPDATE_DEVICE("v9958", v9958_device, screen_update)
MCFG_SCREEN_SIZE(512 + 32, (212 + 28) * 2)
MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1)
MCFG_SCREEN_PALETTE("v9958:palette")
MCFG_MACHINE_RESET_OVERRIDE(sangho_state,pzlestar)
@ -494,6 +495,7 @@ static MACHINE_CONFIG_START( sexyboom, sangho_state )
MCFG_SCREEN_UPDATE_DEVICE("v9958", v9958_device, screen_update)
MCFG_SCREEN_SIZE(512 + 32, (212 + 28) * 2)
MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1)
MCFG_SCREEN_PALETTE("v9958:palette")
MCFG_MACHINE_RESET_OVERRIDE(sangho_state,sexyboom)

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

@ -164,7 +164,7 @@ READ8_MEMBER( wardner_state::wardner_bank_r )
// 0xa000 - 0xafff (paletteram)
else if ((addr >= 0xa000) && (addr < 0xb000))
return m_generic_paletteram_8[addr - 0xa000];
return m_palette->basemem().read8(addr - 0xa000);
// 0xc000 - 0xc7ff (z80 shared ram)
else if ((addr >= 0xc000) && (addr < 0xc800))

2
src/mame/includes/btime.h
View File

@ -12,7 +12,7 @@ public:
m_rambase(*this, "rambase"),
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
m_paletteram(*this, "paletteram"),
m_paletteram(*this, "palette"),
m_bnj_backgroundram(*this, "bnj_bgram"),
m_zoar_scrollram(*this, "zoar_scrollram"),
m_lnc_charbank(*this, "lnc_charbank"),

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

@ -133,7 +133,7 @@ UINT32 capbowl_state::screen_update_capbowl(screen_device &screen, bitmap_rgb32
/* if we're blanked, just fill with black */
if (m_tms34061->m_display.blanked)
{
bitmap.fill(m_palette->black_pen(), cliprect);
bitmap.fill(rgb_t::black, cliprect);
return 0;
}

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

@ -128,7 +128,7 @@ void citycon_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec
inline void citycon_state::changecolor_RRRRGGGGBBBBxxxx( int color, int indx )
{
int data = m_generic_paletteram_8[2 * indx | 1] | (m_generic_paletteram_8[2 * indx] << 8);
int data = m_palette->basemem().read8(2 * indx | 1) | (m_palette->basemem().read8(2 * indx) << 8);
m_palette->set_pen_color(color, pal4bit(data >> 12), pal4bit(data >> 8), pal4bit(data >> 4));
}

8
src/mame/video/itech8.c
View File

@ -582,7 +582,7 @@ UINT32 itech8_state::screen_update_itech8_2layer(screen_device &screen, bitmap_r
/* if we're blanked, just fill with black */
if (m_tms34061->m_display.blanked)
{
bitmap.fill(m_palette->black_pen(), cliprect);
bitmap.fill(rgb_t::black, cliprect);
return 0;
}
@ -617,7 +617,7 @@ UINT32 itech8_state::screen_update_itech8_grmatch(screen_device &screen, bitmap_
/* if we're blanked, just fill with black */
if (m_tms34061->m_display.blanked)
{
bitmap.fill(m_palette->black_pen(), cliprect);
bitmap.fill(rgb_t::black, cliprect);
return 0;
}
@ -665,7 +665,7 @@ UINT32 itech8_state::screen_update_itech8_2page(screen_device &screen, bitmap_rg
/* if we're blanked, just fill with black */
if (m_tms34061->m_display.blanked)
{
bitmap.fill(m_palette->black_pen(), cliprect);
bitmap.fill(rgb_t::black, cliprect);
return 0;
}
@ -696,7 +696,7 @@ UINT32 itech8_state::screen_update_itech8_2page_large(screen_device &screen, bit
/* if we're blanked, just fill with black */
if (m_tms34061->m_display.blanked)
{
bitmap.fill(m_palette->black_pen(), cliprect);
bitmap.fill(rgb_t::black, cliprect);
return 0;
}

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

@ -230,7 +230,7 @@ void k007121_device::sprites_draw( bitmap_ind16 &bitmap, const rectangle &clipre
// gfx_element *gfx = gfxs[chip];
int flipscreen = m_flipscreen;
int i, num, inc, offs[5];
int is_flakatck = (palette->indirect_entries() == 0);
int is_flakatck = (palette == NULL);
if (is_flakatck)
{