luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'work' into tomerge

This commit is contained in:
Tim Edwards 2018-09-21 14:44:29 -04:00
parent 504293735a 7b3c4e8777
commit 9fc2ee9648
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drc/DRCbasic.c
View File

@ -563,12 +563,24 @@ drcTile (tile, arg)
{
if (mrd)
{
/* Run-length rule */
if ((cptr->drcc_cdist <= cptr->drcc_dist) ||
((edgeTop - edgeBot) > cptr->drcc_cdist))
if (cptr->drcc_cdist <= cptr->drcc_dist)
triggered = mrd->entries;
else
cptr = cptr->drcc_next;
else
{
/* Run-length rule */
for (i = 0; i < mrd->entries; i++)
{
lr = &mrd->rlist[i];
GeoClip(lr, arg->dCD_clip);
if ((lr->r_ytop - lr->r_ybot) > cptr->drcc_cdist)
{
triggered = mrd->entries;
break;
}
}
if (i == mrd->entries)
cptr = cptr->drcc_next;
}
}
else
cptr = cptr->drcc_next;
@ -930,12 +942,24 @@ checkbottom:
if (trigpending)
{
if (mrd)
/* Run-length rule */
if ((cptr->drcc_cdist <= cptr->drcc_dist) ||
((edgeRight - edgeLeft) > cptr->drcc_cdist))
if (cptr->drcc_cdist <= cptr->drcc_dist)
triggered = mrd->entries;
else
cptr = cptr->drcc_next;
else
{
/* Run-length rule */
for (i = 0; i < mrd->entries; i++)
{
lr = &mrd->rlist[i];
GeoClip(lr, arg->dCD_clip);
if ((lr->r_xtop - lr->r_xbot) > cptr->drcc_cdist)
{
triggered = mrd->entries;
break;
}
}
if (i == mrd->entries)
cptr = cptr->drcc_next;
}
else
cptr = cptr->drcc_next;
}