Previous 15994 Revisions Next

r3189 Saturday 6th September, 2008 at 20:12:08 UTC by Roberto Zandonà
[C64] fixed border and sprite wrap
[src/mess/video]vic6567.c

src/mess/video/vic6567.c
r3188r3189
824824   register int x, mask, shift;
825825
826826   if ((y < YPOS) || (y >= (VIC2_STARTVISIBLELINES + VIC2_VISIBLELINES)) || (xbegin <= 1) || (xbegin >= (VIC2_STARTVISIBLECOLUMNS + VIC2_VISIBLECOLUMNS)))
827      return;
827      {
828         return;
829      }
828830
829831   for (x = 0, mask = 0xc0, shift = 6; x < 8; x += 2, mask >>= 2, shift -= 2)
830832   {
r3188r3189
11261128   if (video_skip_this_frame ())
11271129      return;
11281130
1129
11301131   /* top part of display not rastered */
11311132   first -= VIC2_YPOS - YPOS;
11321133   last -= VIC2_YPOS - YPOS;
1134
11331135/*
11341136   if ((first >= last) || (last <= 0))
11351137   {
r3188r3189
11591161
11601162   line = first;
11611163   if (line < end) {
1162      plot_box(vic2.bitmap, 0, line + FIRSTLINE, vic2.bitmap->width, end-line, FRAMECOLOR);
1164      plot_box(vic2.bitmap, 0, line + FIRSTLINE, vic2.bitmap->width, 1, FRAMECOLOR);
11631165      line=end;
11641166   }
11651167
r3188r3189
12261228            vic2_draw_character (ybegin, yend, ch, yoff, xoff, vic2.mono);
12271229         }
12281230      }
1231   }
1232
1233   line = first;
1234   if (LINES25)
1235   {
1236      vline = line - vic2.y_begin - YPOS;
1237   }
1238   else
1239   {
1240      vline = line - vic2.y_begin - YPOS + 8 - VERTICALPOS;
1241   }
1242   if (last < vic2.y_end + YPOS)
1243      end = last;
1244   else
1245      end = vic2.y_end + YPOS;
1246
1247   for (; line < end; vline = (vline + 8) & ~7, line = line + 1 + yend - ybegin)
1248   {
1249      offs = (vline >> 3) * 40;
1250      ybegin = vline & 7;
1251      yoff = line - ybegin;
1252      yend = (yoff + 7 < end) ? 7 : (end - yoff - 1);
12291253      /* sprite priority, sprite overwrites lowerprior pixels */
12301254      for (i = 7; i >= 0; i--)
12311255      {
r3188r3189
12441268            }
12451269            if (yoff + syend > YPOS + 200)
12461270               syend = YPOS + 200 - yoff - 1;
1271            if (yoff + ybegin < 0)
1272               {
1273                  ybegin = -yoff;
1274                  yend = - yoff;
1275               }
1276
12471277            if (SPRITE_MULTICOLOR (i))
12481278               vic2_draw_sprite_multi (i, yoff, ybegin, syend);
12491279            else
r3188r3189
12551285                  vic2.sprites[i].paintedline[j] = 0;
12561286            }
12571287         }
1258         // sprite wrap y at the top of the screen
1259         else if (SPRITEON (i) && (SPRITE_Y_POS (i) < yoff) && (yoff == YPOS))
1288         // wrap at the top of the screen
1289         else if    (SPRITEON (i) &&
1290               (yoff + ybegin >= SPRITE_Y_POS (i)) &&
1291               (yoff + ybegin - SPRITE_Y_POS (i) < (SPRITE_Y_EXPAND (i)? 21 * 2 : 21 )) &&
1292               (SPRITE_Y_POS (i) < 0))
12601293         {
1261            int wrapped = YPOS - SPRITE_Y_POS (i);
1294            int wrapped = - SPRITE_Y_POS (i) + 6;
1295
12621296            syend = yend;
12631297
12641298            if (SPRITE_Y_EXPAND (i))
r3188r3189
12771311            vic2.sprites[i].line = wrapped;
12781312
12791313            if (SPRITE_MULTICOLOR (i))
1280               vic2_draw_sprite_multi (i, YPOS, 0 , syend);
1314               vic2_draw_sprite_multi (i, 0, 0 , syend);
12811315            else
1282               vic2_draw_sprite (i, YPOS, 0 , syend);
1316               vic2_draw_sprite (i, 0, 0 , syend);
12831317
12841318            if ((syend != yend) || (vic2.sprites[i].line > 20))
12851319            {
r3188r3189
12891323            }
12901324         }
12911325         else if (SPRITEON (i) && (yoff + ybegin <= SPRITE_Y_POS (i))
1292                && (yoff + yend >= SPRITE_Y_POS (i)))
1326                && (yoff + yend >= SPRITE_Y_POS (i)) && (SPRITE_Y_POS (i) >= 0) )
12931327         {
12941328            syend = yend;
12951329            if (SPRITE_Y_EXPAND (i))
r3188r3189
13041338            }
13051339            if (yoff + syend >= YPOS + 200)
13061340               syend = YPOS + 200 - yoff - 1;
1307            for (j = 0; j < SPRITE_Y_POS (i) - yoff; j++)
1341            for (j = 0; j < SPRITE_Y_POS (i) - yoff; j++)
13081342               vic2.sprites[i].paintedline[j] = 0;
13091343            if (SPRITE_MULTICOLOR (i))
13101344               vic2_draw_sprite_multi (i, yoff, SPRITE_Y_POS (i) - yoff, syend);
13111345            else
13121346               vic2_draw_sprite (i, yoff, SPRITE_Y_POS (i) - yoff, syend);
1347
13131348            if ((syend != yend) || (vic2.sprites[i].line > 20))
13141349            {
13151350               for (j = syend; j <= yend; j++)
r3188r3189
13221357            memset (vic2.sprites[i].paintedline, 0, sizeof (vic2.sprites[i].paintedline));
13231358         }
13241359      }
1325      plot_box(vic2.bitmap, 0, yoff + ybegin + FIRSTLINE, xbegin, yend-ybegin+1, FRAMECOLOR);
1326      plot_box(vic2.bitmap, xend, yoff + ybegin + FIRSTLINE, vic2.bitmap->width - xend, yend-ybegin+1, FRAMECOLOR);
13271360   }
1361   plot_box(vic2.bitmap, 0, first + FIRSTLINE, xbegin, 1, FRAMECOLOR);
1362   plot_box(vic2.bitmap, xend, first + FIRSTLINE, vic2.bitmap->width - xend, 1, FRAMECOLOR);
1363
13281364   if (last < vic2.bitmap->height)
13291365      end = last;
13301366   else
13311367      end = vic2.bitmap->height;
13321368
13331369   if (line < end) {
1334      plot_box(vic2.bitmap, 0, line + FIRSTLINE, vic2.bitmap->width, end-line, FRAMECOLOR);
1370      plot_box(vic2.bitmap, 0, first + FIRSTLINE, vic2.bitmap->width, 1, FRAMECOLOR);
13351371      line = end;
13361372   }
13371373}
r3188r3189
13621398   {
13631399      vic2_set_interrupt (1);
13641400   }
1401
13651402// printf("%08x  ",(int)activecpu_gettotalcycles());
13661403   if (vic2.on)
1367      if ((vic2.rasterline >= VIC2_FIRSTRASTERLINE) && (vic2.rasterline < (VIC2_FIRSTRASTERLINE + VIC2_VISIBLELINES))) vic2_drawlines (vic2.rasterline-1, vic2.rasterline);
1404      if ((vic2.rasterline >= VIC2_FIRSTRASTERLINE) && (vic2.rasterline < (VIC2_FIRSTRASTERLINE + VIC2_VISIBLELINES)))
1405         vic2_drawlines (vic2.rasterline-1, vic2.rasterline);
13681406}
13691407
13701408VIDEO_UPDATE( vic2 )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team