From e2394d47a14591fe8e9ee418c3f3dcebec6e7fff Mon Sep 17 00:00:00 2001 From: Latapostrophe Date: Sun, 21 Oct 2018 14:09:25 +0200 Subject: [PATCH] More messages in chatbox + new console backcolours --- src/console.c | 29 ++++++++++++++++++++--------- src/v_video.c | 39 +++++++++++++++++++++++++++------------ 2 files changed, 47 insertions(+), 21 deletions(-) diff --git a/src/console.c b/src/console.c index f79a6faf..b007a09b 100644 --- a/src/console.c +++ b/src/console.c @@ -135,8 +135,11 @@ static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"} static consvar_t cons_backpic = {"con_backpic", "translucent", CV_SAVE, backpic_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Gray"}, {2, "Brown"}, - {3, "Red"}, {4, "Orange"}, {5, "Yellow"}, - {6, "Green"}, {7, "Blue"}, {8, "Cyan"}, + {3, "Pink"}, {4, "Rose"}, {5, "Red"}, + {6, "Orange"}, {7, "Gold"}, {8, "Yellow"}, + {9, "Emerald"}, {10,"Green"}, {11,"Cyan"}, + {12,"Steel"}, {13,"Blue"}, {14,"Purple"}, + {15,"Lavender"}, {0, NULL}}; consvar_t cons_backcolor = {"con_backcolor", "Green", CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change, 0, NULL, NULL, 0, 0, NULL}; @@ -255,6 +258,7 @@ void CON_SetupBackColormap(void) UINT16 i, palsum; UINT8 j, palindex; UINT8 *pal = W_CacheLumpName(GetPalette(), PU_CACHE); + INT32 shift = 6; if (!consolebgmap) consolebgmap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL); @@ -264,12 +268,19 @@ void CON_SetupBackColormap(void) case 0: palindex = 15; break; // White case 1: palindex = 31; break; // Gray case 2: palindex = 63; break; // Brown - case 3: palindex = 143; break; // Red - case 4: palindex = 95; break; // Orange - case 5: palindex = 111; break; // Yellow - case 6: palindex = 175; break; // Green - case 7: palindex = 239; break; // Blue - case 8: palindex = 219; break; // Cyan + case 3: palindex = 150; shift = 7; break; // Pink + case 4: palindex = 127; shift = 7; break; // Rose + case 5: palindex = 143; break; // Red + case 6: palindex = 95; break; // Orange + case 7: palindex = 119; shift = 7; break; // Gold + case 8: palindex = 111; break; // Yellow + case 9: palindex = 191; shift = 7; break; // Emerald + case 10: palindex = 175; break; // Green + case 11: palindex = 219; break; // Cyan + case 12: palindex = 207; shift = 7; break; // Steel + case 13: palindex = 239; break; // Blue + case 14: palindex = 199; shift = 7; break; // Purple + case 15: palindex = 255; shift = 7; break; // Lavender // Default green default: palindex = 175; break; } @@ -277,7 +288,7 @@ void CON_SetupBackColormap(void) // setup background colormap for (i = 0, j = 0; i < 768; i += 3, j++) { - palsum = (pal[i] + pal[i+1] + pal[i+2]) >> 6; + palsum = (pal[i] + pal[i+1] + pal[i+2]) >> shift; consolebgmap[j] = (UINT8)(palindex - palsum); } } diff --git a/src/v_video.c b/src/v_video.c index 1ddaccfd..58ff3c60 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -976,12 +976,19 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c) case 0: hwcolor = 0xffffff00; break; // White case 1: hwcolor = 0x80808000; break; // Gray case 2: hwcolor = 0x40201000; break; // Brown - case 3: hwcolor = 0xff000000; break; // Red - case 4: hwcolor = 0xff800000; break; // Orange - case 5: hwcolor = 0x80800000; break; // Yellow - case 6: hwcolor = 0x00800000; break; // Green - case 7: hwcolor = 0x0000ff00; break; // Blue - case 8: hwcolor = 0x4080ff00; break; // Cyan + case 3: hwcolor = 0xfa807200; break; // Pink + case 4: hwcolor = 0xff69b400; break; // Rose + case 5: hwcolor = 0xff000000; break; // Red + case 6: hwcolor = 0xff800000; break; // Orange + case 7: hwcolor = 0xdaa52000; break; // Gold + case 8: hwcolor = 0x80800000; break; // Yellow + case 9: hwcolor = 0x00ff0000; break; // Emerald + case 10: hwcolor = 0x00800000; break; // Green + case 11: hwcolor = 0x4080ff00; break; // Cyan + case 12: hwcolor = 0x4682b400; break; // Steel + case 13: hwcolor = 0x0000ff00; break; // Blue + case 14: hwcolor = 0xff00ff00; break; // Purple + case 15: hwcolor = 0xee82ee00; break; // Lavender // Default green default: hwcolor = 0x00800000; break; } @@ -1236,12 +1243,20 @@ void V_DrawFadeConsBack(INT32 plines) case 0: hwcolor = 0xffffff00; break; // White case 1: hwcolor = 0x80808000; break; // Gray case 2: hwcolor = 0x40201000; break; // Brown - case 3: hwcolor = 0xff000000; break; // Red - case 4: hwcolor = 0xff800000; break; // Orange - case 5: hwcolor = 0x80800000; break; // Yellow - case 6: hwcolor = 0x00800000; break; // Green - case 7: hwcolor = 0x0000ff00; break; // Blue - case 8: hwcolor = 0x4080ff00; break; // Cyan + case 3: hwcolor = 0xfa807200; break; // Pink + case 4: hwcolor = 0xff69b400; break; // Rose + case 5: hwcolor = 0xff000000; break; // Red + case 6: hwcolor = 0xff800000; break; // Orange + case 7: hwcolor = 0xdaa52000; break; // Gold + case 8: hwcolor = 0x80800000; break; // Yellow + case 9: hwcolor = 0x00ff0000; break; // Emerald + case 10: hwcolor = 0x00800000; break; // Green + case 11: hwcolor = 0x4080ff00; break; // Cyan + case 12: hwcolor = 0x4682b400; break; // Steel + case 13: hwcolor = 0x0000ff00; break; // Blue + case 14: hwcolor = 0xff00ff00; break; // Purple + case 15: hwcolor = 0xee82ee00; break; // Lavender + // Default green default: hwcolor = 0x00800000; break; }