mirror of
https://github.com/holub/mame
synced 2025-04-25 17:56:43 +03:00
Merge branch 'master' of https://github.com/mamedev/mame
This commit is contained in:
commit
f53a341c6b
@ -1750,6 +1750,7 @@ MACHINE_CONFIG_START(model1_state::vf)
|
||||
model1_hle(config);
|
||||
|
||||
MCFG_DEVICE_MODIFY("ioboard")
|
||||
MCFG_DEVICE_BIOS("epr14869b");
|
||||
MCFG_MODEL1IO_IN2_CB(IOPORT("IN.2"))
|
||||
MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model1_state, vf_outputs_w))
|
||||
MACHINE_CONFIG_END
|
||||
|
@ -112,7 +112,7 @@ ROM_START( model1io )
|
||||
|
||||
// Virtua Fighter (837-8936)
|
||||
ROM_SYSTEM_BIOS(1, "epr14869b", "EPR-14869B")
|
||||
ROMX_LOAD("epr-14869b.25", 0x0000, 0x10000, BAD_DUMP CRC(b410f22b) SHA1(75c5009ca4d21ebb53d54d4e3fb8aa55a4c74a07), ROM_BIOS(2)) // stray FFs at xx49, xx5F, xxC9, xxDF
|
||||
ROMX_LOAD("epr-14869b.25", 0x0000, 0x10000, CRC(2d093304) SHA1(af0fe245eb9fa3c3c60e4b685f1e779f83d894f9), ROM_BIOS(2))
|
||||
|
||||
// Daytona USA (837-10539)
|
||||
ROM_SYSTEM_BIOS(2, "epr14869c", "EPR-14869C")
|
||||
|
@ -445,8 +445,9 @@ READ8_MEMBER(ataxx_state::ataxx_svram_port_r)
|
||||
|
||||
uint32_t leland_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
|
||||
{
|
||||
bitmap_ind16 const &src = m_tilemap->pixmap();
|
||||
int const height_mask = m_tilemap->height() - 1;
|
||||
m_tilemap->set_scrollx(0, m_xscroll);
|
||||
m_tilemap->set_scrolly(0, m_yscroll);
|
||||
m_tilemap->draw(screen, bitmap, cliprect, 0);
|
||||
|
||||
/* for each scanline in the visible region */
|
||||
for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
|
||||
@ -457,12 +458,8 @@ uint32_t leland_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
|
||||
/* for each pixel on the scanline */
|
||||
for (int x = cliprect.min_x; x <= cliprect.max_x; x++)
|
||||
{
|
||||
/* compute the effective scrolled pixel coordinates */
|
||||
uint16_t const sx = (x + m_xscroll) & 0x07ff;
|
||||
uint16_t const sy = (y + m_yscroll) & height_mask;
|
||||
|
||||
/* build the pen, background is d0-d5 */
|
||||
pen_t pen = src.pix16(sy, sx) & 0x3f;
|
||||
pen_t pen = dst[x] & 0x3f;
|
||||
|
||||
/* foreground is d6-d9 */
|
||||
if (x & 0x01)
|
||||
|
Loading…
Reference in New Issue
Block a user