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

Corrected a few errors in the code from yesterday's commit.

This commit is contained in:
Tim Edwards 2021-04-06 10:13:36 -04:00
parent f84de3676a
commit 84f4bf82ea
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.152 8.3.153

16
database/DBcellcopy.c
View File

@ -439,12 +439,14 @@ dbPaintSubFunc(tile, cxp)
Tile *tile; /* Pointer to source tile with shield type */ Tile *tile; /* Pointer to source tile with shield type */
TreeContext *cxp; /* Context from DBTreeSrTiles */ TreeContext *cxp; /* Context from DBTreeSrTiles */
{ {
Rect rect; SearchContext *scx;
Rect sourceRect, targetRect;
int pNum; int pNum;
TileType type, loctype, subType; TileType type, loctype, subType;
Plane *plane; Plane *plane;
struct dbCopySubData *csd; /* Client data */ struct dbCopySubData *csd; /* Client data */
scx = cxp->tc_scx;
csd = (struct dbCopySubData *)cxp->tc_filter->tf_arg; csd = (struct dbCopySubData *)cxp->tc_filter->tf_arg;
plane = csd->csd_plane; plane = csd->csd_plane;
pNum = csd->csd_pNum; pNum = csd->csd_pNum;
@ -457,10 +459,14 @@ dbPaintSubFunc(tile, cxp)
} }
/* Construct the rect for the tile */ /* Construct the rect for the tile */
TITORECT(tile, &rect); TITORECT(tile, &sourceRect);
/* Transform to target coordinates */
GEOTRANSRECT(&scx->scx_trans, &sourceRect, &targetRect);
csd->csd_modified = TRUE; csd->csd_modified = TRUE;
return DBNMPaintPlane(plane, type, &rect, DBStdPaintTbl(subType, pNum), return DBNMPaintPlane(plane, type, &targetRect, DBStdPaintTbl(subType, pNum),
(PaintUndoInfo *)NULL); (PaintUndoInfo *)NULL);
} }
@ -497,8 +503,6 @@ dbEraseNonSub(tile, cxp)
loctype = (SplitSide(tile)) ? SplitRightType(tile) : SplitLeftType(tile); loctype = (SplitSide(tile)) ? SplitRightType(tile) : SplitLeftType(tile);
if (loctype == TT_SPACE) return 0; if (loctype == TT_SPACE) return 0;
} }
else
loctype = type;
/* Construct the rect for the tile */ /* Construct the rect for the tile */
TITORECT(tile, &sourceRect); TITORECT(tile, &sourceRect);
@ -507,7 +511,7 @@ dbEraseNonSub(tile, cxp)
GEOTRANSRECT(&scx->scx_trans, &sourceRect, &targetRect); GEOTRANSRECT(&scx->scx_trans, &sourceRect, &targetRect);
/* Erase the substrate type from the area of this tile in the target plane. */ /* Erase the substrate type from the area of this tile in the target plane. */
return DBNMPaintPlane(plane, loctype, &targetRect, DBStdEraseTbl(subType, pNum), return DBNMPaintPlane(plane, type, &targetRect, DBStdEraseTbl(subType, pNum),
(PaintUndoInfo *)NULL); (PaintUndoInfo *)NULL);
} }

5
extract/ExtMain.c
View File

@ -692,7 +692,10 @@ extExtractStack(stack, doExtract, rootDef)
/* Replace any modified substrate planes */ /* Replace any modified substrate planes */
for (; sl; sl = sl->sl_next) for (; sl; sl = sl->sl_next)
{ {
ExtRevertSubstrate(sl->sl_def, sl->sl_plane); // ExtRevertSubstrate(sl->sl_def, sl->sl_plane);
DBFreePaintPlane(sl->sl_plane);
TiFreePlane(sl->sl_plane);
freeMagic(sl); freeMagic(sl);
} }