luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-09-02 11:08:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Extended the "mask-hints" operator to work correctly through a

Browse Source 
hierarchy.
This commit is contained in:
Tim Edwards
2021-01-06 10:33:43 -05:00
parent d6eeb90f6b
commit d4c3939feb
6 changed files with 151 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/DBcellsrch.c
+10 -5
View File
@@ -848,9 +848,8 @@ dbTreeCellSrFunc(scx, fp)
if ((fp->tf_xmask == CU_DESCEND_NO_LOCK) && (use->cu_flags & CU_LOCKED))
return 2;
else if ((!DBDescendSubcell(use, fp->tf_xmask)) ||
(fp->tf_xmask == CU_DESCEND_ALL))
result = (*fp->tf_func)(scx, fp->tf_arg);
else if (!DBDescendSubcell(use, fp->tf_xmask))
return (*fp->tf_func)(scx, fp->tf_arg);
else
{
if ((use->cu_def->cd_flags & CDAVAILABLE) == 0)
@@ -859,9 +858,15 @@ dbTreeCellSrFunc(scx, fp)
if (!DBCellRead(use->cu_def, (char *) NULL, TRUE, dereference, NULL))
return 0;
}
result = DBCellSrArea(scx, dbTreeCellSrFunc, (ClientData) fp);
}
return result;
if (fp->tf_xmask == CU_DESCEND_ALL)
{
result = (*fp->tf_func)(scx, fp->tf_arg);
if (result != 0) return result;
}
/* Run recursively on children in search area */
return DBCellSrArea(scx, dbTreeCellSrFunc, (ClientData) fp);
}
/*