mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-08-28 17:15:13 +02:00
Corrected variables that set the PaintPlane routine, which had been
changed from returning void to returning int without changing the type of the variable, thus causing a compiler warning.
This commit is contained in:
+1
-1
@@ -1926,7 +1926,7 @@ CmdXor(w, cmd)
|
||||
|
||||
PaintResultType DBXORResultTbl[NP][NT][NT];
|
||||
PaintResultType (*curPaintSave)[NT][NT];
|
||||
void (*curPlaneSave)();
|
||||
int (*curPlaneSave)();
|
||||
|
||||
int p, t, h;
|
||||
|
||||
|
||||
+1
-1
@@ -114,7 +114,7 @@ drcArrayFunc(scx, arg)
|
||||
ClientData drcArrayClientData; /* Extra parameter to pass to func. */
|
||||
PaintResultType (*savedPaintTable)[NT][NT];
|
||||
PaintResultType (*savedEraseTable)[NT][NT];
|
||||
void (*savedPaintPlane)();
|
||||
int (*savedPaintPlane)();
|
||||
|
||||
if ((use->cu_xlo == use->cu_xhi) && (use->cu_ylo == use->cu_yhi))
|
||||
return 2;
|
||||
|
||||
+2
-2
@@ -697,7 +697,7 @@ DRCInteractionCheck(def, area, erasebox, func, cdarg)
|
||||
int oldTiles, count, x, y, errorSaveType;
|
||||
Rect intArea, square, cliparea, subArea;
|
||||
PaintResultType (*savedPaintTable)[NT][NT];
|
||||
void (*savedPaintPlane)();
|
||||
int (*savedPaintPlane)();
|
||||
struct drcClientData arg;
|
||||
SearchContext scx;
|
||||
|
||||
@@ -897,7 +897,7 @@ DRCFlatCheck(use, area)
|
||||
SearchContext scx;
|
||||
void drcIncCount();
|
||||
PaintResultType (*savedPaintTable)[NT][NT];
|
||||
void (*savedPaintPlane)();
|
||||
int (*savedPaintPlane)();
|
||||
int drcFlatCount = 0;
|
||||
|
||||
UndoDisable();
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ int gaDebNoClean = 0;
|
||||
|
||||
/* Used in the "*garoute split" command */
|
||||
PlaneMask gaSplitPlaneMask;
|
||||
void (*gaSplitPaintPlane)();
|
||||
int (*gaSplitPaintPlane)();
|
||||
Rect gaSplitArea;
|
||||
int gaSplitType;
|
||||
|
||||
|
||||
+1
-1
@@ -1074,7 +1074,7 @@ SelectAndCopy2(newSourceDef)
|
||||
SearchContext scx;
|
||||
Rect editArea, labelArea, expanded;
|
||||
int plane;
|
||||
void (*savedPaintPlane)();
|
||||
int (*savedPaintPlane)();
|
||||
extern int selACPaintFunc(); /* Forward reference. */
|
||||
extern int selACCellFunc();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user