diff --git a/src/console.c b/src/console.c index e77c400b3..1c8640396 100644 --- a/src/console.c +++ b/src/console.c @@ -248,11 +248,11 @@ void CON_ReSetupBackColormap(UINT16 num) { j = pal[i] + pal[i+1] + pal[i+2]; cwhitemap[k] = (UINT8)(15 - (j>>6)); - corangemap[k] = (UINT8)(95 - (j>>6)); - cbluemap[k] = (UINT8)(239 - (j>>6)); - cgreenmap[k] = (UINT8)(175 - (j>>6)); + corangemap[k] = (UINT8)(63 - (j>>6)); + cbluemap[k] = (UINT8)(143 - (j>>6)); + cgreenmap[k] = (UINT8)(111 - (j>>6)); cgraymap[k] = (UINT8)(31 - (j>>6)); - credmap[k] = (UINT8)(143 - (j>>6)); + credmap[k] = (UINT8)(47 - (j>>6)); } } @@ -283,11 +283,11 @@ static void CON_SetupBackColormap(void) { j = pal[i] + pal[i+1] + pal[i+2]; cwhitemap[k] = (UINT8)(15 - (j>>6)); - corangemap[k] = (UINT8)(95 - (j>>6)); - cbluemap[k] = (UINT8)(239 - (j>>6)); - cgreenmap[k] = (UINT8)(175 - (j>>6)); + corangemap[k] = (UINT8)(63 - (j>>6)); + cbluemap[k] = (UINT8)(143 - (j>>6)); + cgreenmap[k] = (UINT8)(111 - (j>>6)); cgraymap[k] = (UINT8)(31 - (j>>6)); - credmap[k] = (UINT8)(143 - (j>>6)); + credmap[k] = (UINT8)(47 - (j>>6)); } // setup the other colormaps, for console text @@ -306,20 +306,20 @@ static void CON_SetupBackColormap(void) orangemap[i] = (UINT8)i; } - yellowmap[3] = (UINT8)103; - yellowmap[9] = (UINT8)115; - purplemap[3] = (UINT8)195; - purplemap[9] = (UINT8)198; - lgreenmap[3] = (UINT8)162; - lgreenmap[9] = (UINT8)170; - bluemap[3] = (UINT8)228; - bluemap[9] = (UINT8)238; + yellowmap[3] = (UINT8)73; + yellowmap[9] = (UINT8)66; + purplemap[3] = (UINT8)168; + purplemap[9] = (UINT8)170; + lgreenmap[3] = (UINT8)102; + lgreenmap[9] = (UINT8)106; + bluemap[3] = (UINT8)131; + bluemap[9] = (UINT8)142; graymap[3] = (UINT8)10; graymap[9] = (UINT8)15; - redmap[3] = (UINT8)124; - redmap[9] = (UINT8)127; - orangemap[3] = (UINT8)85; - orangemap[9] = (UINT8)90; + redmap[3] = (UINT8)194; + redmap[9] = (UINT8)32; + orangemap[3] = (UINT8)52; + orangemap[9] = (UINT8)57; } // Setup the console text buffer diff --git a/src/d_clisrv.c b/src/d_clisrv.c index c0179ca1b..31738e9b2 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1101,7 +1101,7 @@ static inline void CL_DrawConnectionStatus(void) if (cl_mode != cl_downloadfiles) { INT32 i, animtime = ((ccstime / 4) & 15) + 16; - UINT8 palstart = (cl_mode == cl_searching) ? 128 : 160; + UINT8 palstart = (cl_mode == cl_searching) ? 32 : 96; // 15 pal entries total. const char *cltext; @@ -1139,8 +1139,8 @@ static inline void CL_DrawConnectionStatus(void) dldlength = (INT32)((fileneeded[lastfilenum].currentsize/(double)fileneeded[lastfilenum].totalsize) * 256); if (dldlength > 256) dldlength = 256; - V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175); - V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 160); + V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 111); + V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 96); memset(tempname, 0, sizeof(tempname)); nameonly(strncpy(tempname, fileneeded[lastfilenum].filename, 31)); diff --git a/src/m_menu.c b/src/m_menu.c index 06aaac0ef..111be9479 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2820,7 +2820,7 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv) void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines) { // Solid color textbox. - V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 239); + V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 143); //V_DrawFill(x+8, y+8, width*8, boxlines*8, 31); /* patch_t *p; diff --git a/src/r_main.c b/src/r_main.c index ffd4d5d50..77d6a456c 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1282,7 +1282,7 @@ void R_RenderPlayerView(player_t *player) if (cv_homremoval.value == 1) V_DrawFill(0, 0, vid.width, vid.height, 31); // No HOM effect! else //'development' HOM removal -- makes it blindingly obvious if HOM is spotted. - V_DrawFill(0, 0, vid.width, vid.height, 128+(timeinmap&15)); + V_DrawFill(0, 0, vid.width, vid.height, 32+(timeinmap&15)); } portalrender = 0;