Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-22 13:48:55 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

snes.c: Fixed OAM overflow [jbo_85, Fabio Priuli]

Browse Source
This commit is contained in:
Fabio Priuli 2010-03-08 22:35:40 +00:00
parent ad194976cb
commit 2de8c84647
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -548,21 +548,21 @@ INLINE void snes_draw_tile_object( UINT16 tileaddr, INT16 x, UINT8 priority, UIN
mask >>= 1; mask >>= 1;
} }
if (scanlines[SNES_MAINSCREEN].enable) if (ii >= 0 && ii < SNES_SCR_WIDTH && scanlines[SNES_MAINSCREEN].enable)
{ {
UINT8 clr = colour; if (scanlines[SNES_MAINSCREEN].priority[ii] <= priority)
{
UINT8 clr = colour;
#ifdef SNES_LAYER_DEBUG #ifdef SNES_LAYER_DEBUG
if (!debug_options.windows_disabled) if (!debug_options.windows_disabled)
#endif /* SNES_LAYER_DEBUG */ #endif /* SNES_LAYER_DEBUG */
/* Clip to windows */ /* Clip to windows */
if (scanlines[SNES_MAINSCREEN].clip) if (scanlines[SNES_MAINSCREEN].clip)
clr &= snes_ppu.clipmasks[SNES_OAM][ii]; clr &= snes_ppu.clipmasks[SNES_OAM][ii];
/* Only draw if we have a colour (0 == transparent) */ /* Only draw if we have a colour (0 == transparent) */
if (clr) if (clr)
{
if ((scanlines[SNES_MAINSCREEN].priority[ii] <= priority) && (ii >= 0))
{ {
c = snes_cgram[(pal + clr) % FIXED_COLOUR]; c = snes_cgram[(pal + clr) % FIXED_COLOUR];
@ -574,21 +574,21 @@ INLINE void snes_draw_tile_object( UINT16 tileaddr, INT16 x, UINT8 priority, UIN
} }
} }
if (scanlines[SNES_SUBSCREEN].enable) if (ii >= 0 && ii < SNES_SCR_WIDTH && scanlines[SNES_SUBSCREEN].enable)
{ {
UINT8 clr = colour; if (scanlines[SNES_SUBSCREEN].priority[ii] <= priority)
{
UINT8 clr = colour;
#ifdef SNES_LAYER_DEBUG #ifdef SNES_LAYER_DEBUG
if (!debug_options.windows_disabled) if (!debug_options.windows_disabled)
#endif /* SNES_LAYER_DEBUG */ #endif /* SNES_LAYER_DEBUG */
/* Clip to windows */ /* Clip to windows */
if (scanlines[SNES_SUBSCREEN].clip) if (scanlines[SNES_SUBSCREEN].clip)
clr &= snes_ppu.clipmasks[SNES_OAM][ii]; clr &= snes_ppu.clipmasks[SNES_OAM][ii];
/* Only draw if we have a colour (0 == transparent) */ /* Only draw if we have a colour (0 == transparent) */
if (clr) if (clr)
{
if ((scanlines[SNES_SUBSCREEN].priority[ii] <= priority) && (ii >= 0))
{ {
c = snes_cgram[(pal + clr) % FIXED_COLOUR]; c = snes_cgram[(pal + clr) % FIXED_COLOUR];
@ -1083,7 +1083,7 @@ static void snes_update_objects( UINT8 priority_tbl, UINT16 curline )
UINT8 count = 0; UINT8 count = 0;
for (xs = (snes_ppu.oam.size[size] - 1); xs >= 0; xs--) for (xs = (snes_ppu.oam.size[size] - 1); xs >= 0; xs--)
{ {
if ((x + (count << 3) < SNES_SCR_WIDTH + 8)) if ((x + (count << 3) < SNES_SCR_WIDTH))
{ {
snes_draw_tile_object(charaddr + name_sel + tile + table_obj_offset[ys][xs] + line, x + (count++ << 3), priority, hflip, pal, blend); snes_draw_tile_object(charaddr + name_sel + tile + table_obj_offset[ys][xs] + line, x + (count++ << 3), priority, hflip, pal, blend);
} }
@ -1094,7 +1094,7 @@ static void snes_update_objects( UINT8 priority_tbl, UINT16 curline )
{ {
for (xs = 0; xs < snes_ppu.oam.size[size]; xs++) for (xs = 0; xs < snes_ppu.oam.size[size]; xs++)
{ {
if ((x + (xs << 3) < SNES_SCR_WIDTH + 8)) if ((x + (xs << 3) < SNES_SCR_WIDTH))
{ {
snes_draw_tile_object(charaddr + name_sel + tile + table_obj_offset[ys][xs] + line, x + (xs << 3), priority, hflip, pal, blend); snes_draw_tile_object(charaddr + name_sel + tile + table_obj_offset[ys][xs] + line, x + (xs << 3), priority, hflip, pal, blend);
} }