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

snes.c: fixed a sprite regression, no whatsnew

Browse Source
This commit is contained in:
Fabio Priuli 2010-04-08 05:49:07 +00:00
parent 51c44a667a
commit 2238e2d3ea
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/mame/video/snes.c
View File

@ -859,7 +859,7 @@ static void snes_oam_list_build( void )
oam_spritelist[ii].pal = 128 + ((oamram[oam] & 0x0e) << 3); oam_spritelist[ii].pal = 128 + ((oamram[oam] & 0x0e) << 3);
oam_spritelist[ii].tile = (oamram[oam--] & 0x1) << 8; oam_spritelist[ii].tile = (oamram[oam--] & 0x1) << 8;
oam_spritelist[ii].tile |= oamram[oam--]; oam_spritelist[ii].tile |= oamram[oam--];
oam_spritelist[ii].y = oamram[oam--] + 1; /* We seem to need to add one here.... */ oam_spritelist[ii].y = oamram[oam--] + 1;
oam_spritelist[ii].x = oamram[oam--]; oam_spritelist[ii].x = oamram[oam--];
oam_spritelist[ii].size = (extra & 0x80) >> 7; oam_spritelist[ii].size = (extra & 0x80) >> 7;
extra <<= 1; extra <<= 1;
@ -867,10 +867,7 @@ static void snes_oam_list_build( void )
extra <<= 1; extra <<= 1;
oam_spritelist[ii].y *= snes_ppu.obj_interlace; oam_spritelist[ii].y *= snes_ppu.obj_interlace;
oam_spritelist[ii].y &= 0x1ff;
/* Adjust if past maximum position */
if (oam_spritelist[ii].y >= snes_ppu.beam.last_visible_line * snes_ppu.interlace)
oam_spritelist[ii].y -= 256 * snes_ppu.interlace;
oam_spritelist[ii].x &= 0x1ff; oam_spritelist[ii].x &= 0x1ff;
@ -1013,35 +1010,42 @@ static void snes_update_objects_rto( UINT16 curline )
priority = oam_spritelist[active_sprite].priority_bits; priority = oam_spritelist[active_sprite].priority_bits;
pal = oam_spritelist[active_sprite].pal; pal = oam_spritelist[active_sprite].pal;
/* Only objects using tiles over 255 use name select */ /* Adjust y, if past maximum position (for sprites which overlap between top & bottom) */
name_sel = (tile < 256) ? 0 : snes_ppu.oam.name_select; if (y >= 256 * snes_ppu.interlace)
y -= 256 * snes_ppu.interlace;
ys = (curline - y) >> 3; if (curline >= y && curline < (y + (height << 3)))
line = (curline - y) % 8;
if (vflip)
{ {
ys = height - ys - 1; /* Only objects using tiles over 255 use name select */
line = 7 - line; name_sel = (tile < 256) ? 0 : snes_ppu.oam.name_select;
}
line <<= 1;
tile <<= 5;
for (jj = 0; jj < width; jj++) ys = (curline - y) >> 3;
{ line = (curline - y) % 8;
INT16 xx = (x + (jj << 3)) & 0x1ff; if (vflip)
{
ys = height - ys - 1;
line = 7 - line;
}
line <<= 1;
tile <<= 5;
if (x != 256 && xx >= 256 && (xx + 7) < 512) for (jj = 0; jj < width; jj++)
continue; {
INT16 xx = (x + (jj << 3)) & 0x1ff;
if (time_over++ >= 34) if (x != 256 && xx >= 256 && (xx + 7) < 512)
break; continue;
xs = (hflip) ? (width - 1 - jj) : jj; if (time_over++ >= 34)
oam_tilelist[time_over - 1].tileaddr = name_sel + tile + table_obj_offset[ys][xs] + line; break;
oam_tilelist[time_over - 1].hflip = hflip;
oam_tilelist[time_over - 1].x = xx; xs = (hflip) ? (width - 1 - jj) : jj;
oam_tilelist[time_over - 1].pal = pal; oam_tilelist[time_over - 1].tileaddr = name_sel + tile + table_obj_offset[ys][xs] + line;
oam_tilelist[time_over - 1].priority = priority; oam_tilelist[time_over - 1].hflip = hflip;
oam_tilelist[time_over - 1].x = xx;
oam_tilelist[time_over - 1].pal = pal;
oam_tilelist[time_over - 1].priority = priority;
}
} }
} }