From dfc427e81ac203eac583c66f0a4cddbe72fb62fc Mon Sep 17 00:00:00 2001 From: mazmazz Date: Mon, 7 Jan 2019 21:54:38 -0500 Subject: [PATCH] Dummy out SRB2-CHAT console colors Pending translation to 2.2 palette indexes --- src/console.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/console.c b/src/console.c index f6bfccfe6..f64ead21c 100644 --- a/src/console.c +++ b/src/console.c @@ -126,6 +126,8 @@ static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"} // whether to use console background picture, or translucent mode static consvar_t cons_backpic = {"con_backpic", "translucent", CV_SAVE, backpic_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +// \todo SRB2-CHAT 2.1 colors -- pending translation to 2.2 palette indexes +#if 0 static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Black"}, {2, "Sepia"}, {3, "Brown"}, {4, "Pink"}, {5, "Raspberry"}, {6, "Red"}, {7, "Creamsicle"}, {8, "Orange"}, @@ -134,6 +136,13 @@ static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Black"}, { {15,"Periwinkle"}, {16,"Blue"}, {17,"Purple"}, {18,"Lavender"}, {0, NULL}}; +#else +static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Gray"}, {2, "Brown"}, + {3, "Red"}, {4, "Orange"}, {5, "Yellow"}, + {6, "Green"}, {7, "Blue"}, {8, "Purple"}, + {9, "Magenta"}, {10, "Aqua"}, + {0, NULL}}; +#endif consvar_t cons_backcolor = {"con_backcolor", "Green", CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change, 0, NULL, NULL, 0, 0, NULL}; @@ -245,6 +254,9 @@ void CON_SetupBackColormapEx(INT32 color, boolean prompt) color = cons_backcolor.value; shift = 6; // 12 colors -- shift of 7 means 6 colors + + // \todo SRB2-CHAT colors, pending translation to 2.2 palette indexes +#if 0 switch (color) { case 0: palindex = 15; break; // White @@ -269,6 +281,24 @@ void CON_SetupBackColormapEx(INT32 color, boolean prompt) // Default green default: palindex = 175; break; } +#else + switch (color) + { + case 0: palindex = 15; break; // White + case 1: palindex = 31; break; // Gray + case 2: palindex = 239; break; // Brown + case 3: palindex = 47; break; // Red + case 4: palindex = 63; break; // Orange + case 5: palindex = 79; shift = 7; break; // Yellow + case 6: palindex = 111; break; // Green + case 7: palindex = 159; break; // Blue + case 8: palindex = 199; shift = 7; break; // Purple + case 9: palindex = 187; break; // Magenta + case 10: palindex = 139; break; // Aqua + // Default green + default: palindex = 175; color = 11; break; + } +#endif if (prompt) {