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

MT #00489: fix tile-sprite priority in Hole Land

Browse Source
This commit is contained in:
Angelo Salese 2013-10-27 21:31:40 +00:00
parent fca4d40e6d
commit b7b2af8938
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mame/drivers/holeland.c
View File

@ -5,7 +5,7 @@
driver by Mathis Rosenhauer
TODO:
- tile/sprite priority in holeland
- tile/sprite priority in holeland (fixed? Needs further testing)
- missing high bit of sprite X coordinate? (see round 2 and 3 of attract mode
in crzrally)
@ -24,16 +24,16 @@ static ADDRESS_MAP_START( holeland_map, AS_PROGRAM, 8, holeland_state )
AM_RANGE(0xa000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc001) AM_WRITE(holeland_pal_offs_w)
AM_RANGE(0xc006, 0xc007) AM_WRITE(holeland_flipscreen_w)
AM_RANGE(0xe000, 0xe3ff) AM_WRITE(holeland_colorram_w) AM_SHARE("colorram")
AM_RANGE(0xe400, 0xe7ff) AM_WRITE(holeland_videoram_w) AM_SHARE("videoram")
AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(holeland_colorram_w) AM_SHARE("colorram")
AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(holeland_videoram_w) AM_SHARE("videoram")
AM_RANGE(0xf000, 0xf3ff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( crzrally_map, AS_PROGRAM, 8, holeland_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe000, 0xe3ff) AM_WRITE(holeland_colorram_w) AM_SHARE("colorram")
AM_RANGE(0xe400, 0xe7ff) AM_WRITE(holeland_videoram_w) AM_SHARE("videoram")
AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(holeland_colorram_w) AM_SHARE("colorram")
AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(holeland_videoram_w) AM_SHARE("videoram")
AM_RANGE(0xe800, 0xebff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xf000, 0xf000) AM_WRITE(holeland_scroll_w)
AM_RANGE(0xf800, 0xf801) AM_WRITE(holeland_pal_offs_w)

18
src/mame/video/holeland.c
View File

@ -18,19 +18,22 @@
TILE_GET_INFO_MEMBER(holeland_state::holeland_get_tile_info)
{
/*
--x- ---- priority?
xxxx ---- color
---- xx-- flip yx
---- --xx tile upper bits
*/
int attr = m_colorram[tile_index];
int tile_number = m_videoram[tile_index] | ((attr & 0x03) << 8);
/*if (machine().input().code_pressed(KEYCODE_Q) && (attr & 0x10)) tile_number = rand(); */
/*if (machine().input().code_pressed(KEYCODE_W) && (attr & 0x20)) tile_number = rand(); */
/*if (machine().input().code_pressed(KEYCODE_E) && (attr & 0x40)) tile_number = rand(); */
/*if (machine().input().code_pressed(KEYCODE_R) && (attr & 0x80)) tile_number = rand(); */
SET_TILE_INFO_MEMBER(
0,
tile_number,
m_palette_offset + ((attr >> 4) & 0x0f),
TILE_FLIPYX((attr >> 2) & 0x03));
tileinfo.group = (attr >> 4) & 1;
tileinfo.group = (attr >> 5) & 1;
}
TILE_GET_INFO_MEMBER(holeland_state::crzrally_get_tile_info)
@ -43,7 +46,7 @@ TILE_GET_INFO_MEMBER(holeland_state::crzrally_get_tile_info)
tile_number,
m_palette_offset + ((attr >> 4) & 0x0f),
TILE_FLIPYX((attr >> 2) & 0x03));
tileinfo.group = (attr >> 4) & 1;
tileinfo.group = (attr >> 5) & 1;
}
/***************************************************************************
@ -154,7 +157,7 @@ void holeland_state::crzrally_draw_sprites( bitmap_ind16 &bitmap,const rectangle
code = spriteram[offs + 1] + ((spriteram[offs + 3] & 0x01) << 8);
color = (spriteram[offs + 3] >> 4) + ((spriteram[offs + 3] & 0x01) << 4);
/* Bit 1 unknown */
/* Bit 1 unknown but somehow related to X offset (clipping range?) */
flipx = spriteram[offs + 3] & 0x04;
flipy = spriteram[offs + 3] & 0x08;
@ -180,7 +183,6 @@ void holeland_state::crzrally_draw_sprites( bitmap_ind16 &bitmap,const rectangle
UINT32 holeland_state::screen_update_holeland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
/*m_bg_tilemap->mark_all_dirty(); */
m_bg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
holeland_draw_sprites(bitmap, cliprect);
m_bg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);