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

Add more information to illegal overlap warnings 

Print the names of the tile types that are illegally overlapping. This
gives us a better idea of what is wrong, eg:

feedback add "Illegal overlap between obsm2 and m2 (types do not connect)" medium
This commit is contained in:
Anton Blanchard 2022-01-11 12:22:10 +11:00 committed by Tim Edwards
parent 940a18efab
commit 93dbc77dcf
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extract/ExtHier.c
View File

@ -540,9 +540,13 @@ extHierConnectFunc2(cum, ha)
} }
else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot) else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot)
{ {
char message[1024];
snprintf(message, sizeof(message), "Illegal overlap between %s and %s (types do not connect)",
DBTypeShortName(ha->hierType), DBTypeShortName(ttype));
extNumErrors++; extNumErrors++;
if (!DebugIsSet(extDebugID, extDebNoFeedback)) if (!DebugIsSet(extDebugID, extDebNoFeedback))
DBWFeedbackAdd(&r, "Illegal overlap (types do not connect)", DBWFeedbackAdd(&r, message,
ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS); ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS);
} }
@ -642,9 +646,13 @@ extHierConnectFunc3(cum, ha)
} }
else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot) else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot)
{ {
char message[1024];
snprintf(message, sizeof(message), "Illegal overlap between %s and %s (types do not connect)",
DBTypeShortName(ha->hierType), DBTypeShortName(ttype));
extNumErrors++; extNumErrors++;
if (!DebugIsSet(extDebugID, extDebNoFeedback)) if (!DebugIsSet(extDebugID, extDebNoFeedback))
DBWFeedbackAdd(&r, "Illegal overlap (types do not connect)", DBWFeedbackAdd(&r, message,
ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS); ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS);
} }