diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c index 1d4cea281..1e2de0881 100644 --- a/polymer/eduke32/build/src/build.c +++ b/polymer/eduke32/build/src/build.c @@ -9011,7 +9011,7 @@ void clearmidstatbar16(void) static void clearministatbar16(void) { - int32_t i, col = whitecol - 20; + int32_t i, col = editorcolors[25]; begindrawing(); diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index 2b6f62602..1988ef517 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -16959,7 +16959,7 @@ void draw2dgrid(int32_t posxe, int32_t posye, int32_t posze, int16_t cursectnum, 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 || 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 != xp2) - drawline16(xp1,yp1,xp1,yp2,whitecol-25); + drawline16(xp1,yp1,xp1,yp2,editorcolors[25]); } } if (i >= editorgridextent && xp1 < xdim) xp2 = xp1; if (xp2 >= 0 && xp2 < xdim) - drawline16(xp2,yp1, xp2,yp2, whitecol-25); + drawline16(xp2,yp1, xp2,yp2, editorcolors[25]); } // 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)) { - drawline16mid(-xp1,-yp1, -xp2,-yp1, whitecol-25); + drawline16mid(-xp1,-yp1, -xp2,-yp1, editorcolors[25]); tempy = yp1; } } diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 474f05d34..9ef5846ce 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -7872,9 +7872,9 @@ static void InitCustomColors(void) vgapal16[32*4+2] = 21; // grid color - vgapal16[25*4+0] = 19; - vgapal16[25*4+1] = 17; - vgapal16[25*4+2] = 17; + vgapal16[25*4+0] = 17; + vgapal16[25*4+1] = 15; + vgapal16[25*4+2] = 15; vgapal16[26*4+0] = 24; vgapal16[26*4+1] = 24; diff --git a/polymer/eduke32/source/m32common.c b/polymer/eduke32/source/m32common.c index 6f8550179..87ec8393c 100644 --- a/polymer/eduke32/source/m32common.c +++ b/polymer/eduke32/source/m32common.c @@ -59,7 +59,7 @@ const char *YUPDOWNWALL[2] = {"UPWALL","DOWNWALL"}; void drawgradient(void) { - int32_t i, col = whitecol-21; + int32_t i, col = editorcolors[25]; begindrawing(); for (i=ydim-STATUS2DSIZ+16; i0; i++,col--) CLEARLINES2D(i, 1, (col<<24)|(col<<16)|(col<<8)|col);