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

plow: add ANSI prototypes plowMergeBottom() plowMergeTop() 

This exposes the incorrect call sites, that are also fixed here.
This commit is contained in:
Darryl L. Miles 2025-10-03 22:08:37 +01:00 committed by R. Timothy Edwards
parent aef23fd5f3
commit b1424bfaf3
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plow/PlowTest.c
View File

@ -143,6 +143,7 @@ PlowTest(w, cmd)
Plane *plane;
Edge edge;
Tile *tp;
Tile *delay1 = NULL;
if (!ToolGetEditBox(&editArea) || !ToolGetBox(&rootBoxDef, &rootBox))
return;
@ -341,7 +342,7 @@ PlowTest(w, cmd)
TiToRect(tp, &editArea);
TiToRect(RT(tp), &area2);
(void) GeoInclude(&area2, &editArea);
plowMergeBottom(tp, plane);
plowMergeBottom(&delay1, tp, plane);
DBWAreaChanged(def, &editArea, DBW_ALLWINDOWS, &DBAllButSpaceBits);
break;
case PC_MERGEUP:
@ -350,7 +351,7 @@ PlowTest(w, cmd)
TiToRect(tp, &editArea);
TiToRect(RT(tp), &area2);
(void) GeoInclude(&area2, &editArea);
plowMergeTop(tp, plane);
plowMergeTop(&delay1, tp, plane);
DBWAreaChanged(def, &editArea, DBW_ALLWINDOWS, &DBAllButSpaceBits);
break;
case PC_PRINT:
@ -391,6 +392,7 @@ PlowTest(w, cmd)
plowWhenBot = TRUE;
break;
}
TiFreeIf(delay1);
}
/*

4
plow/plow.h
View File

@ -22,6 +22,8 @@
#define _MAGIC__PLOW__PLOW_H
#include "utils/magic.h"
#include "windows/windows.h" /* MagWindow */
#include "textio/txcommands.h" /* TxCommand */
/* Technology file clients */
extern int PlowTechInit(), PlowTechFinal();
@ -33,7 +35,7 @@ extern bool PlowDRCLine();
extern bool Plow(CellDef *def, Rect *userRect, const TileTypeBitMask *layersp, int direction);
/* Debugging command procedure */
extern int PlowTest();
extern void PlowTest(MagWindow *w, TxCommand *cmd);
extern void PlowExtendJogHorizon();

4
plow/plowInt.h
View File

@ -270,8 +270,8 @@ extern int plowSrShadowInitial(int pNum, Rect *area, const TileTypeBitMask *okT
extern bool plowYankMore();
extern void PlowRandomTest();
extern void plowDebugInit();
extern void plowMergeBottom();
extern void plowMergeTop();
extern void plowMergeBottom(Tile **delay1, Tile *tp, Plane *plane); /* for PlowTest.c */
extern void plowMergeTop(Tile **delay1, Tile *tp, Plane *plane); /* for PlowTest.c */
extern void plowMoveEdge();
extern int plowShadowInitialRHS();
extern int plowShadowLHS();