Previous 15994 Revisions Next

r7763 Thursday 8th April, 2010 at 05:51:20 UTC by Fabio Priuli
[SNES] Fixed a sprite regression
[src/mame/video]snes.c

src/mame/video/snes.c
r7762r7763
859859      oam_spritelist[ii].pal = 128 + ((oamram[oam] & 0x0e) << 3);
860860      oam_spritelist[ii].tile = (oamram[oam--] & 0x1) << 8;
861861      oam_spritelist[ii].tile |= oamram[oam--];
862      oam_spritelist[ii].y = oamram[oam--] + 1;   /* We seem to need to add one here.... */
862      oam_spritelist[ii].y = oamram[oam--] + 1;
863863      oam_spritelist[ii].x = oamram[oam--];
864864      oam_spritelist[ii].size = (extra & 0x80) >> 7;
865865      extra <<= 1;
r7762r7763
867867      extra <<= 1;
868868
869869      oam_spritelist[ii].y *= snes_ppu.obj_interlace;
870      oam_spritelist[ii].y &= 0x1ff;
870871
871      /* Adjust if past maximum position */
872      if (oam_spritelist[ii].y >= snes_ppu.beam.last_visible_line * snes_ppu.interlace)
873         oam_spritelist[ii].y -= 256 * snes_ppu.interlace;
874
875872      oam_spritelist[ii].x &= 0x1ff;
876873
877874      /* Determine object size */
r7762r7763
10131010      priority = oam_spritelist[active_sprite].priority_bits;
10141011      pal = oam_spritelist[active_sprite].pal;
10151012
1016      /* Only objects using tiles over 255 use name select */
1017      name_sel = (tile < 256) ? 0 : snes_ppu.oam.name_select;
1013      /* Adjust y, if past maximum position (for sprites which overlap between top & bottom) */
1014      if (y >= 256 * snes_ppu.interlace)
1015         y -= 256 * snes_ppu.interlace;
10181016
1019      ys = (curline - y) >> 3;
1020      line = (curline - y) % 8;
1021      if (vflip)
1017      if (curline >= y && curline < (y + (height << 3)))
10221018      {
1023         ys = height - ys - 1;
1024         line = 7 - line;
1025      }
1026      line <<= 1;
1027      tile <<= 5;
1019         /* Only objects using tiles over 255 use name select */
1020         name_sel = (tile < 256) ? 0 : snes_ppu.oam.name_select;
10281021
1029      for (jj = 0; jj < width; jj++)
1030      {
1031         INT16 xx = (x + (jj << 3)) & 0x1ff;
1022         ys = (curline - y) >> 3;
1023         line = (curline - y) % 8;
1024         if (vflip)
1025         {
1026            ys = height - ys - 1;
1027            line = 7 - line;
1028         }
1029         line <<= 1;
1030         tile <<= 5;
10321031
1033         if (x != 256 && xx >= 256 && (xx + 7) < 512)
1034            continue;
1032         for (jj = 0; jj < width; jj++)
1033         {
1034            INT16 xx = (x + (jj << 3)) & 0x1ff;
10351035
1036         if (time_over++ >= 34)
1037            break;
1036            if (x != 256 && xx >= 256 && (xx + 7) < 512)
1037               continue;
10381038
1039         xs = (hflip) ? (width - 1 - jj) : jj;
1040         oam_tilelist[time_over - 1].tileaddr = name_sel + tile + table_obj_offset[ys][xs] + line;
1041         oam_tilelist[time_over - 1].hflip = hflip;
1042         oam_tilelist[time_over - 1].x = xx;
1043         oam_tilelist[time_over - 1].pal = pal;
1044         oam_tilelist[time_over - 1].priority = priority;
1039            if (time_over++ >= 34)
1040               break;
1041
1042            xs = (hflip) ? (width - 1 - jj) : jj;
1043            oam_tilelist[time_over - 1].tileaddr = name_sel + tile + table_obj_offset[ys][xs] + line;
1044            oam_tilelist[time_over - 1].hflip = hflip;
1045            oam_tilelist[time_over - 1].x = xx;
1046            oam_tilelist[time_over - 1].pal = pal;
1047            oam_tilelist[time_over - 1].priority = priority;
1048         }
10451049      }
10461050   }
10471051

Previous 15994 Revisions Next


© 1998-2018 The MESS Team