A couple of Mapster32 tweaks to play nicer with different palettes.

git-svn-id: https://svn.eduke32.com/eduke32@5284 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-07-09 05:58:00 +00:00
parent ff466191cb
commit 3ff2e2155c
4 changed files with 9 additions and 9 deletions

View file

@ -9011,7 +9011,7 @@ void clearmidstatbar16(void)
static void clearministatbar16(void) static void clearministatbar16(void)
{ {
int32_t i, col = whitecol - 20; int32_t i, col = editorcolors[25];
begindrawing(); begindrawing();

View file

@ -16959,7 +16959,7 @@ void draw2dgrid(int32_t posxe, int32_t posye, int32_t posze, int16_t cursectnum,
xp2 += xinc; xp2 += xinc;
} }
i = drawline16(halfxdim16+sx1,midydim16+sy1+yofs, halfxdim16+sx1+dx,midydim16+sy1+dy+yofs, whitecol-25); i = drawline16(halfxdim16+sx1,midydim16+sy1+yofs, halfxdim16+sx1+dx,midydim16+sy1+dy+yofs, editorcolors[25]);
if (i==0 || (xp2<-editorgridextent || xp2>editorgridextent || if (i==0 || (xp2<-editorgridextent || xp2>editorgridextent ||
yp2<-editorgridextent || yp2>editorgridextent)) yp2<-editorgridextent || yp2>editorgridextent))
{ {
@ -17007,13 +17007,13 @@ void draw2dgrid(int32_t posxe, int32_t posye, int32_t posze, int16_t cursectnum,
if (xp1 >= 0) if (xp1 >= 0)
{ {
if (xp1 != xp2) if (xp1 != xp2)
drawline16(xp1,yp1,xp1,yp2,whitecol-25); drawline16(xp1,yp1,xp1,yp2,editorcolors[25]);
} }
} }
if (i >= editorgridextent && xp1 < xdim) if (i >= editorgridextent && xp1 < xdim)
xp2 = xp1; xp2 = xp1;
if (xp2 >= 0 && xp2 < xdim) if (xp2 >= 0 && xp2 < xdim)
drawline16(xp2,yp1, xp2,yp2, whitecol-25); drawline16(xp2,yp1, xp2,yp2, editorcolors[25]);
} }
// horizontal lines // horizontal lines
@ -17028,7 +17028,7 @@ void draw2dgrid(int32_t posxe, int32_t posye, int32_t posze, int16_t cursectnum,
{ {
if ((yp1 > midydim16-ydim16) && (yp1 <= midydim16)) if ((yp1 > midydim16-ydim16) && (yp1 <= midydim16))
{ {
drawline16mid(-xp1,-yp1, -xp2,-yp1, whitecol-25); drawline16mid(-xp1,-yp1, -xp2,-yp1, editorcolors[25]);
tempy = yp1; tempy = yp1;
} }
} }

View file

@ -7872,9 +7872,9 @@ static void InitCustomColors(void)
vgapal16[32*4+2] = 21; vgapal16[32*4+2] = 21;
// grid color // grid color
vgapal16[25*4+0] = 19; vgapal16[25*4+0] = 17;
vgapal16[25*4+1] = 17; vgapal16[25*4+1] = 15;
vgapal16[25*4+2] = 17; vgapal16[25*4+2] = 15;
vgapal16[26*4+0] = 24; vgapal16[26*4+0] = 24;
vgapal16[26*4+1] = 24; vgapal16[26*4+1] = 24;

View file

@ -59,7 +59,7 @@ const char *YUPDOWNWALL[2] = {"UPWALL","DOWNWALL"};
void drawgradient(void) void drawgradient(void)
{ {
int32_t i, col = whitecol-21; int32_t i, col = editorcolors[25];
begindrawing(); begindrawing();
for (i=ydim-STATUS2DSIZ+16; i<ydim && col>0; i++,col--) for (i=ydim-STATUS2DSIZ+16; i<ydim && col>0; i++,col--)
CLEARLINES2D(i, 1, (col<<24)|(col<<16)|(col<<8)|col); CLEARLINES2D(i, 1, (col<<24)|(col<<16)|(col<<8)|col);