diff --git a/src/command.c b/src/command.c index bc1750eb..dd10bc8a 100644 --- a/src/command.c +++ b/src/command.c @@ -1548,6 +1548,30 @@ void CV_AddValue(consvar_t *var, INT32 increment) return; } } + else if (var == &cv_playercolor) + { + // Special case for the playercolor variable, used only directly from the menu + if (increment > 0) // Going up! + { + newvalue = var->value + 1; + if (newvalue > MAXSKINCOLORS-1) + newvalue = 1; + var->value = newvalue; + var->string = var->PossibleValue[var->value].strvalue; + var->func(); + return; + } + else if (increment < 0) // Going down! + { + newvalue = var->value - 1; + if (newvalue < 1) + newvalue = MAXSKINCOLORS-1; + var->value = newvalue; + var->string = var->PossibleValue[var->value].strvalue; + var->func(); + return; + } + } #ifdef PARANOIA if (currentindice == -1) I_Error("CV_AddValue: current value %d not found in possible value\n", diff --git a/src/dehacked.c b/src/dehacked.c index 3d024955..e488d3ee 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -7150,70 +7150,70 @@ static const char *const ML_LIST[16] = { // This DOES differ from r_draw's Color_Names, unfortunately. // Also includes Super colors static const char *COLOR_ENUMS[] = { // Rejigged for Kart. - "NONE", // 00 // SKINCOLOR_NONE - "IVORY", // 01 // SKINCOLOR_IVORY - "WHITE", // 02 // SKINCOLOR_WHITE - "SILVER", // 03 // SKINCOLOR_SILVER - "CLOUDY", // 04 // SKINCOLOR_CLOUDY - "GREY", // 05 // SKINCOLOR_GREY - "DARKGREY", // 06 // SKINCOLOR_DARKGREY - "BLACK", // 07 // SKINCOLOR_BLACK - "SALMON", // 08 // SKINCOLOR_SALMON - "PINK", // 09 // SKINCOLOR_PINK - "LIGHTRED", // 10 // SKINCOLOR_LIGHTRED - "FULLRANGERED", // 11 // SKINCOLOR_FULLRANGERED - "RED", // 12 // SKINCOLOR_RED - "DARKPINK", // 13 // SKINCOLOR_DARKPINK - "DARKRED", // 14 // SKINCOLOR_DARKRED - "DAWN", // 15 // SKINCOLOR_DAWN - "ORANGE", // 16 // SKINCOLOR_ORANGE - "FULLRANGEORANGE", // 17 // SKINCOLOR_FULLRANGEORANGE - "DARKORANGE", // 18 // SKINCOLOR_DARKORANGE - "GOLDENBROWN", // 19 // SKINCOLOR_GOLDENBROWN - "ROSEWOOD", // 20 // SKINCOLOR_ROSEWOOD - "DARKROSEWOOD", // 21 // SKINCOLOR_DARKROSEWOOD - "SEPIA", // 22 // SKINCOLOR_SEPIA - "BEIGE", // 23 // SKINCOLOR_BEIGE - "BROWN", // 24 // SKINCOLOR_BROWN - "LEATHER", // 25 // SKINCOLOR_LEATHER - "YELLOW", // 26 // SKINCOLOR_YELLOW - "PEACH", // 27 // SKINCOLOR_PEACH - "LIGHTORANGE", // 28 // SKINCOLOR_LIGHTORANGE - "PEACHBROWN", // 29 // SKINCOLOR_PEACHBROWN - "GOLD", // 30 // SKINCOLOR_GOLD - "FULLRANGEPEACHBROWN", // 31 // SKINCOLOR_FULLRANGEPEACHBROWN - "GYPSYVOMIT", // 32 // SKINCOLOR_GYPSYVOMIT - "GARDEN", // 33 // SKINCOLOR_GARDEN - "LIGHTARMY", // 34 // SKINCOLOR_LIGHTARMY - "ARMY", // 35 // SKINCOLOR_ARMY - "PISTACHIO", // 36 // SKINCOLOR_PISTACHIO - "ROBOHOODGREEN", // 37 // SKINCOLOR_ROBOHOODGREEN - "OLIVE", // 38 // SKINCOLOR_OLIVE - "DARKARMY", // 39 // SKINCOLOR_DARKARMY - "LIGHTGREEN", // 40 // SKINCOLOR_LIGHTGREEN - "UGLYGREEN", // 41 // SKINCOLOR_UGLYGREEN - "NEONGREEN", // 42 // SKINCOLOR_NEONGREEN - "GREEN", // 43 // SKINCOLOR_GREEN - "DARKGREEN", // 44 // SKINCOLOR_DARKGREEN - "DARKNEONGREEN", // 45 // SKINCOLOR_DARKNEONGREEN - "FROST", // 46 // SKINCOLOR_FROST - "LIGHTSTEELBLUE", // 47 // SKINCOLOR_LIGHTSTEELBLUE - "LIGHTBLUE", // 48 // SKINCOLOR_LIGHTBLUE - "CYAN", // 49 // SKINCOLOR_CYAN - "CERULEAN", // 50 // SKINCOLOR_CERULEAN - "TURQUOISE", // 51 // SKINCOLOR_TURQUOISE - "TEAL", // 52 // SKINCOLOR_TEAL - "STEELBLUE", // 53 // SKINCOLOR_STEELBLUE - "BLUE", // 54 // SKINCOLOR_BLUE - "FULLRANGEBLUE", // 55 // SKINCOLOR_FULLRANGEBLUE - "DARKSTEELBLUE", // 56 // SKINCOLOR_DARKSTEELBLUE - "DARKBLUE", // 57 // SKINCOLOR_DARKBLUE - "JETBLACK", // 58 // SKINCOLOR_JETBLACK - "LILAC", // 59 // SKINCOLOR_LILAC - "PURPLE", // 60 // SKINCOLOR_PURPLE - "LAVENDER", // 61 // SKINCOLOR_LAVENDER - "BYZANTIUM", // 62 // SKINCOLOR_BYZANTIUM - "INDIGO", // 63 // SKINCOLOR_INDIGO + "NONE", // 00 // SKINCOLOR_NONE + "IVORY", // 01 // SKINCOLOR_IVORY + "WHITE", // 02 // SKINCOLOR_WHITE + "SILVER", // 03 // SKINCOLOR_SILVER + "CLOUDY", // 04 // SKINCOLOR_CLOUDY + "GREY", // 05 // SKINCOLOR_GREY + "DARKGREY", // 06 // SKINCOLOR_DARKGREY + "BLACK", // 07 // SKINCOLOR_BLACK + "SALMON", // 08 // SKINCOLOR_SALMON + "PINK", // 09 // SKINCOLOR_PINK + "LIGHTRED", // 10 // SKINCOLOR_LIGHTRED + "SHINYRED", // 11 // SKINCOLOR_SHINYRED + "RED", // 12 // SKINCOLOR_RED + "DARKPINK", // 13 // SKINCOLOR_DARKPINK + "DARKRED", // 14 // SKINCOLOR_DARKRED + "DAWN", // 15 // SKINCOLOR_DAWN + "ORANGE", // 16 // SKINCOLOR_ORANGE + "SHINYORANGE", // 17 // SKINCOLOR_SHINYORANGE + "DARKORANGE", // 18 // SKINCOLOR_DARKORANGE + "GOLDENBROWN", // 19 // SKINCOLOR_GOLDENBROWN + "ROSEWOOD", // 20 // SKINCOLOR_ROSEWOOD + "DARKROSEWOOD", // 21 // SKINCOLOR_DARKROSEWOOD + "SEPIA", // 22 // SKINCOLOR_SEPIA + "BEIGE", // 23 // SKINCOLOR_BEIGE + "BROWN", // 24 // SKINCOLOR_BROWN + "LEATHER", // 25 // SKINCOLOR_LEATHER + "YELLOW", // 26 // SKINCOLOR_YELLOW + "PEACH", // 27 // SKINCOLOR_PEACH + "LIGHTORANGE", // 28 // SKINCOLOR_LIGHTORANGE + "CARAMEL", // 29 // SKINCOLOR_CARAMEL + "GOLD", // 30 // SKINCOLOR_GOLD + "SHINYCARAMEL", // 31 // SKINCOLOR_SHINYCARAMEL + "VOMIT", // 32 // SKINCOLOR_VOMIT + "GARDEN", // 33 // SKINCOLOR_GARDEN + "LIGHTARMY", // 34 // SKINCOLOR_LIGHTARMY + "ARMY", // 35 // SKINCOLOR_ARMY + "PISTACHIO", // 36 // SKINCOLOR_PISTACHIO + "ROBOHOOD", // 37 // SKINCOLOR_ROBOHOOD + "OLIVE", // 38 // SKINCOLOR_OLIVE + "DARKARMY", // 39 // SKINCOLOR_DARKARMY + "LIGHTGREEN", // 40 // SKINCOLOR_LIGHTGREEN + "UGLYGREEN", // 41 // SKINCOLOR_UGLYGREEN + "NEONGREEN", // 42 // SKINCOLOR_NEONGREEN + "GREEN", // 43 // SKINCOLOR_GREEN + "DARKGREEN", // 44 // SKINCOLOR_DARKGREEN + "SWAMP", // 45 // SKINCOLOR_SWAMP + "FROST", // 46 // SKINCOLOR_FROST + "SLATE", // 47 // SKINCOLOR_SLATE + "LIGHTBLUE", // 48 // SKINCOLOR_LIGHTBLUE + "CYAN", // 49 // SKINCOLOR_CYAN + "CERULEAN", // 50 // SKINCOLOR_CERULEAN + "TURQUOISE", // 51 // SKINCOLOR_TURQUOISE + "TEAL", // 52 // SKINCOLOR_TEAL + "STEELBLUE", // 53 // SKINCOLOR_STEELBLUE + "BLUE", // 54 // SKINCOLOR_BLUE + "SHINYBLUE", // 55 // SKINCOLOR_SHINYBLUE + "NAVY", // 56 // SKINCOLOR_NAVY + "DARKBLUE", // 57 // SKINCOLOR_DARKBLUE + "JETBLACK", // 58 // SKINCOLOR_JETBLACK + "LILAC", // 59 // SKINCOLOR_LILAC + "PURPLE", // 60 // SKINCOLOR_PURPLE + "LAVENDER", // 61 // SKINCOLOR_LAVENDER + "BYZANTIUM", // 62 // SKINCOLOR_BYZANTIUM + "INDIGO", // 63 // SKINCOLOR_INDIGO // Super special awesome Super flashing colors! "SUPER1", // SKINCOLOR_SUPER1 diff --git a/src/doomdef.h b/src/doomdef.h index 5f3ff932..8aa28b5e 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -239,13 +239,13 @@ typedef enum SKINCOLOR_SALMON, SKINCOLOR_PINK, SKINCOLOR_LIGHTRED, - SKINCOLOR_FULLRANGERED, + SKINCOLOR_SHINYRED, SKINCOLOR_RED, SKINCOLOR_DARKPINK, SKINCOLOR_DARKRED, SKINCOLOR_DAWN, SKINCOLOR_ORANGE, - SKINCOLOR_FULLRANGEORANGE, + SKINCOLOR_SHINYORANGE, SKINCOLOR_DARKORANGE, SKINCOLOR_GOLDENBROWN, SKINCOLOR_ROSEWOOD, @@ -257,15 +257,15 @@ typedef enum SKINCOLOR_YELLOW, SKINCOLOR_PEACH, SKINCOLOR_LIGHTORANGE, - SKINCOLOR_PEACHBROWN, + SKINCOLOR_CARAMEL, SKINCOLOR_GOLD, - SKINCOLOR_FULLRANGEPEACHBROWN, - SKINCOLOR_GYPSYVOMIT, + SKINCOLOR_SHINYCARAMEL, + SKINCOLOR_VOMIT, SKINCOLOR_GARDEN, SKINCOLOR_LIGHTARMY, SKINCOLOR_ARMY, SKINCOLOR_PISTACHIO, - SKINCOLOR_ROBOHOODGREEN, + SKINCOLOR_ROBOHOOD, SKINCOLOR_OLIVE, SKINCOLOR_DARKARMY, SKINCOLOR_LIGHTGREEN, @@ -273,9 +273,9 @@ typedef enum SKINCOLOR_NEONGREEN, SKINCOLOR_GREEN, SKINCOLOR_DARKGREEN, - SKINCOLOR_DARKNEONGREEN, + SKINCOLOR_SWAMP, SKINCOLOR_FROST, - SKINCOLOR_LIGHTSTEELBLUE, + SKINCOLOR_SLATE, SKINCOLOR_LIGHTBLUE, SKINCOLOR_CYAN, SKINCOLOR_CERULEAN, @@ -283,8 +283,8 @@ typedef enum SKINCOLOR_TEAL, SKINCOLOR_STEELBLUE, SKINCOLOR_BLUE, - SKINCOLOR_FULLRANGEBLUE, - SKINCOLOR_DARKSTEELBLUE, + SKINCOLOR_SHINYBLUE, + SKINCOLOR_NAVY, SKINCOLOR_DARKBLUE, SKINCOLOR_JETBLACK, SKINCOLOR_LILAC, diff --git a/src/k_kart.c b/src/k_kart.c index 936dbcfb..94cf0607 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -25,72 +25,73 @@ #define DEFAULT_STARTTRANSCOLOR 160 #define NUM_PALETTE_ENTRIES 256 +// These should be within 14 characters to fit on the character select screen const char *KartColor_Names[MAXSKINCOLORS] = { - "None", // 00 // SKINCOLOR_NONE - "Ivory", // 01 // SKINCOLOR_IVORY - "White", // 02 // SKINCOLOR_WHITE - "Silver", // 03 // SKINCOLOR_SILVER - "Cloudy", // 04 // SKINCOLOR_CLOUDY - "Grey", // 05 // SKINCOLOR_GREY - "Dark Grey", // 06 // SKINCOLOR_DARKGREY - "Black", // 07 // SKINCOLOR_BLACK - "Salmon", // 08 // SKINCOLOR_SALMON - "Pink", // 09 // SKINCOLOR_PINK - "Light Red", // 10 // SKINCOLOR_LIGHTRED - "Full-Range Red", // 11 // SKINCOLOR_FULLRANGERED - "Red", // 12 // SKINCOLOR_RED - "Dark Pink", // 13 // SKINCOLOR_DARKPINK - "Dark Red", // 14 // SKINCOLOR_DARKRED - "Dawn", // 15 // SKINCOLOR_DAWN - "Orange", // 16 // SKINCOLOR_ORANGE - "Full-Range Orange", // 17 // SKINCOLOR_FULLRANGEORANGE - "Dark Orange", // 18 // SKINCOLOR_DARKORANGE - "Golden Brown", // 19 // SKINCOLOR_GOLDENBROWN - "Rosewood", // 20 // SKINCOLOR_ROSEWOOD - "Dark Rosewood", // 21 // SKINCOLOR_DARKROSEWOOD - "Sepia", // 22 // SKINCOLOR_SEPIA - "Beige", // 23 // SKINCOLOR_BEIGE - "Brown", // 24 // SKINCOLOR_BROWN - "Leather", // 25 // SKINCOLOR_LEATHER - "Yellow", // 26 // SKINCOLOR_YELLOW - "Peach", // 27 // SKINCOLOR_PEACH - "Light Orange", // 28 // SKINCOLOR_LIGHTORANGE - "Peach-Brown", // 29 // SKINCOLOR_PEACHBROWN - "Gold", // 30 // SKINCOLOR_GOLD - "Full-Range Peach-Brown", // 31 // SKINCOLOR_FULLRANGEPEACHBROWN - "Gypsy Vomit", // 32 // SKINCOLOR_GYPSYVOMIT - "Garden", // 33 // SKINCOLOR_GARDEN - "Light Army", // 34 // SKINCOLOR_LIGHTARMY - "Army", // 35 // SKINCOLOR_ARMY - "Pistachio", // 36 // SKINCOLOR_PISTACHIO - "Robo-Hood Green", // 37 // SKINCOLOR_ROBOHOODGREEN - "Olive", // 38 // SKINCOLOR_OLIVE - "Dark Army", // 39 // SKINCOLOR_DARKARMY - "Light Green", // 40 // SKINCOLOR_LIGHTGREEN - "Ugly Green", // 41 // SKINCOLOR_UGLYGREEN - "Neon Green", // 42 // SKINCOLOR_NEONGREEN - "Green", // 43 // SKINCOLOR_GREEN - "Dark Green", // 44 // SKINCOLOR_DARKGREEN - "Dark Neon Green", // 45 // SKINCOLOR_DARKNEONGREEN - "Frost", // 46 // SKINCOLOR_FROST - "Light Steel Blue", // 47 // SKINCOLOR_LIGHTSTEELBLUE - "Light Blue", // 48 // SKINCOLOR_LIGHTBLUE - "Cyan", // 49 // SKINCOLOR_CYAN - "Cerulean", // 50 // SKINCOLOR_CERULEAN - "Turquoise", // 51 // SKINCOLOR_TURQUOISE - "Teal", // 52 // SKINCOLOR_TEAL - "Steel Blue", // 53 // SKINCOLOR_STEELBLUE - "Blue", // 54 // SKINCOLOR_BLUE - "Full-Range Blue", // 55 // SKINCOLOR_FULLRANGEBLUE - "Dark Steel Blue", // 56 // SKINCOLOR_DARKSTEELBLUE - "Dark Blue", // 57 // SKINCOLOR_DARKBLUE - "Jet Black", // 58 // SKINCOLOR_JETBLACK - "Lilac", // 59 // SKINCOLOR_LILAC - "Purple", // 60 // SKINCOLOR_PURPLE - "Lavender", // 61 // SKINCOLOR_LAVENDER - "Byzantium", // 62 // SKINCOLOR_BYZANTIUM - "Indigo" // 63 // SKINCOLOR_INDIGO + "None", // 00 // SKINCOLOR_NONE + "Ivory", // 01 // SKINCOLOR_IVORY + "White", // 02 // SKINCOLOR_WHITE + "Silver", // 03 // SKINCOLOR_SILVER + "Cloudy", // 04 // SKINCOLOR_CLOUDY + "Grey", // 05 // SKINCOLOR_GREY + "Dark Grey", // 06 // SKINCOLOR_DARKGREY + "Black", // 07 // SKINCOLOR_BLACK + "Salmon", // 08 // SKINCOLOR_SALMON + "Pink", // 09 // SKINCOLOR_PINK + "Light Red", // 10 // SKINCOLOR_LIGHTRED + "Shiny Red", // 11 // SKINCOLOR_SHINYRED + "Red", // 12 // SKINCOLOR_RED + "Dark Pink", // 13 // SKINCOLOR_DARKPINK + "Dark Red", // 14 // SKINCOLOR_DARKRED + "Dawn", // 15 // SKINCOLOR_DAWN + "Orange", // 16 // SKINCOLOR_ORANGE + "Shiny Orange", // 17 // SKINCOLOR_SHINYORANGE + "Dark Orange", // 18 // SKINCOLOR_DARKORANGE + "Golden Brown", // 19 // SKINCOLOR_GOLDENBROWN + "Rosewood", // 20 // SKINCOLOR_ROSEWOOD + "Dark Rosewood", // 21 // SKINCOLOR_DARKROSEWOOD + "Sepia", // 22 // SKINCOLOR_SEPIA + "Beige", // 23 // SKINCOLOR_BEIGE + "Brown", // 24 // SKINCOLOR_BROWN + "Leather", // 25 // SKINCOLOR_LEATHER + "Yellow", // 26 // SKINCOLOR_YELLOW + "Peach", // 27 // SKINCOLOR_PEACH + "Light Orange", // 28 // SKINCOLOR_LIGHTORANGE + "Caramel", // 29 // SKINCOLOR_CARAMEL + "Gold", // 30 // SKINCOLOR_GOLD + "Shiny Caramel", // 31 // SKINCOLOR_SHINYCARAMEL + "Vomit", // 32 // SKINCOLOR_VOMIT + "Garden", // 33 // SKINCOLOR_GARDEN + "Light Army", // 34 // SKINCOLOR_LIGHTARMY + "Army", // 35 // SKINCOLOR_ARMY + "Pistachio", // 36 // SKINCOLOR_PISTACHIO + "Robo-Hood", // 37 // SKINCOLOR_ROBOHOOD + "Olive", // 38 // SKINCOLOR_OLIVE + "Dark Army", // 39 // SKINCOLOR_DARKARMY + "Light Green", // 40 // SKINCOLOR_LIGHTGREEN + "Ugly Green", // 41 // SKINCOLOR_UGLYGREEN + "Neon Green", // 42 // SKINCOLOR_NEONGREEN + "Green", // 43 // SKINCOLOR_GREEN + "Dark Green", // 44 // SKINCOLOR_DARKGREEN + "Swamp", // 45 // SKINCOLOR_SWAMP + "Frost", // 46 // SKINCOLOR_FROST + "Slate", // 47 // SKINCOLOR_SLATEBLUE + "Light Blue", // 48 // SKINCOLOR_LIGHTBLUE + "Cyan", // 49 // SKINCOLOR_CYAN + "Cerulean", // 50 // SKINCOLOR_CERULEAN + "Turquoise", // 51 // SKINCOLOR_TURQUOISE + "Teal", // 52 // SKINCOLOR_TEAL + "Steel Blue", // 53 // SKINCOLOR_STEELBLUE + "Blue", // 54 // SKINCOLOR_BLUE + "Shiny Blue", // 55 // SKINCOLOR_SHINYBLUE + "Navy", // 56 // SKINCOLOR_NAVY + "Dark Blue", // 57 // SKINCOLOR_DARKBLUE + "Jet Black", // 58 // SKINCOLOR_JETBLACK + "Lilac", // 59 // SKINCOLOR_LILAC + "Purple", // 60 // SKINCOLOR_PURPLE + "Lavender", // 61 // SKINCOLOR_LAVENDER + "Byzantium", // 62 // SKINCOLOR_BYZANTIUM + "Indigo" // 63 // SKINCOLOR_INDIGO }; /** \brief Generates a simple case table for given values. Not very optimal, but makes it easy to read in K_GenerateKartColormap. @@ -175,69 +176,69 @@ void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color) for (i = 0; i < SKIN_RAMP_LENGTH; i++) switch (color) { - case SKINCOLOR_IVORY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 120, 120, 120, 0, 0, 0, 0, 1, 1, 2, 2, 4, 6, 8, 10); break; - case SKINCOLOR_WHITE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7); break; - case SKINCOLOR_SILVER: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); break; - case SKINCOLOR_CLOUDY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31); break; - case SKINCOLOR_GREY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23); break; - case SKINCOLOR_DARKGREY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31); break; - case SKINCOLOR_BLACK: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31); break; - case SKINCOLOR_SALMON: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 120, 121, 121, 122, 122, 123, 123, 124, 124, 125, 125, 126, 126, 127, 127); break; - case SKINCOLOR_PINK: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 144, 144, 145, 145, 146, 146, 147, 147, 148, 148, 149, 149, 150, 150, 151, 151); break; - case SKINCOLOR_LIGHTRED: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135); break; - case SKINCOLOR_FULLRANGERED: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143); break; - case SKINCOLOR_RED: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140); break; - case SKINCOLOR_DARKPINK: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141); break; - case SKINCOLOR_DARKRED: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 136, 136, 137, 137, 138, 138, 139, 139, 140, 140, 141, 141, 142, 142, 143, 143); break; - case SKINCOLOR_DAWN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 121, 122, 123, 124, 147, 88, 89, 149, 91, 92, 151, 94, 95, 152, 153); break; - case SKINCOLOR_ORANGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95); break; - case SKINCOLOR_FULLRANGEORANGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 80, 81, 83, 85, 86, 88, 90, 91, 93, 95, 152, 153, 154, 156, 157, 159); break; - case SKINCOLOR_DARKORANGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 88, 89, 90, 91, 92, 93, 94, 95, 152, 153, 154, 155, 156, 157, 158, 159); break; - case SKINCOLOR_GOLDENBROWN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 112, 113, 114, 115, 116, 117, 118, 119, 156, 156, 157, 157, 158, 158, 159, 159); break; - case SKINCOLOR_ROSEWOOD: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 152, 152, 153, 153, 154, 154, 155, 155, 156, 156, 157, 157, 158, 158, 159, 159); break; - case SKINCOLOR_DARKROSEWOOD: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 152, 153, 154, 155, 156, 157, 158, 159, 139, 140, 141, 142, 143, 31, 31, 31); break; - case SKINCOLOR_SEPIA: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 3, 5, 7, 32, 9, 34, 36, 37, 39, 42, 45, 59, 60, 61, 62, 63); break; - case SKINCOLOR_BEIGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47); break; - case SKINCOLOR_BROWN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63); break; - case SKINCOLOR_LEATHER: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 57, 58, 59, 59, 60, 60, 61, 61, 62, 62, 63, 63, 28, 29, 30, 31); break; - case SKINCOLOR_YELLOW: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 97, 98, 99, 100, 101, 102, 103, 104, 113, 113, 114, 115, 115, 115, 116, 117); break; - case SKINCOLOR_PEACH: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79); break; - case SKINCOLOR_LIGHTORANGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 80, 80, 81, 81, 82, 82, 83, 83, 84, 84, 85, 85, 86, 86, 87, 87); break; - case SKINCOLOR_PEACHBROWN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 72, 73, 74, 75, 76, 77, 78, 79, 48, 49, 50, 51, 52, 53, 54, 55); break; - case SKINCOLOR_GOLD: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119, 119); break; - case SKINCOLOR_FULLRANGEPEACHBROWN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 64, 66, 68, 70, 72, 74, 76, 78, 48, 50, 52, 54, 56, 58, 60, 62); break; - case SKINCOLOR_GYPSYVOMIT: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246); break; - case SKINCOLOR_GARDEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 98, 99, 112, 101, 113, 114, 106, 179, 180, 181, 182, 172, 183, 173, 174, 175); break; - case SKINCOLOR_LIGHTARMY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 176, 176, 176, 176, 177, 177, 177, 177, 178, 178, 178, 178, 179, 179, 179, 179); break; - case SKINCOLOR_ARMY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 181, 182, 182, 183, 183); break; - case SKINCOLOR_PISTACHIO: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 176, 176, 177, 177, 178, 178, 179, 179, 166, 167, 168, 169, 170, 171, 172, 173); break; - case SKINCOLOR_ROBOHOODGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 177, 177, 178, 178, 165, 165, 167, 167, 182, 182, 171, 171, 183, 183, 173, 173); break; - case SKINCOLOR_OLIVE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, 31, 31); break; - case SKINCOLOR_DARKARMY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 176, 177, 178, 179, 170, 181, 182, 183, 173, 173, 174, 174, 175, 175, 31, 31); break; - case SKINCOLOR_LIGHTGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 160, 160, 161, 161, 162, 162, 163, 163, 164, 164, 165, 165, 166, 166, 167, 167); break; - case SKINCOLOR_UGLYGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 184, 184, 184, 184, 185, 185, 185, 185, 186, 186, 186, 186, 187, 187, 187, 187); break; - case SKINCOLOR_NEONGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 190, 191, 191); break; - case SKINCOLOR_GREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175); break; - case SKINCOLOR_DARKGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 168, 168, 169, 169, 170, 170, 171, 171, 172, 172, 173, 173, 174, 174, 175, 175); break; - case SKINCOLOR_DARKNEONGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 187, 187, 188, 188, 189, 189, 190, 190, 191, 191, 175, 175, 30, 30, 31, 31); break; - case SKINCOLOR_FROST: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 224, 225, 226, 212, 213, 213, 214, 215, 220, 221, 172, 222, 173, 223, 174, 175); break; - case SKINCOLOR_LIGHTSTEELBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 200, 200, 200, 200, 201, 201, 201, 201, 202, 202, 202, 202, 203, 203, 203, 203); break; - case SKINCOLOR_LIGHTBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 224, 224, 225, 225, 226, 226, 227, 227, 228, 228, 229, 229, 230, 230, 231, 231); break; - case SKINCOLOR_CYAN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 208, 208, 209, 210, 210, 211, 212, 213, 213, 214, 215, 216, 216, 217, 218, 219); break; - case SKINCOLOR_CERULEAN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 216, 216, 216, 216, 217, 217, 217, 217, 218, 218, 218, 218, 219, 219, 219, 219); break; - case SKINCOLOR_TURQUOISE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 208, 208, 209, 210, 210, 211, 212, 213, 213, 214, 215, 220, 220, 221, 222, 223); break; - case SKINCOLOR_TEAL: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 220, 220, 220, 220, 221, 221, 221, 221, 222, 222, 222, 222, 223, 223, 223, 223); break; - case SKINCOLOR_STEELBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 206, 207, 207); break; - case SKINCOLOR_BLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239); break; - case SKINCOLOR_FULLRANGEBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246); break; - case SKINCOLOR_DARKSTEELBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 200, 201, 202, 203, 204, 205, 206, 238, 239, 240, 241, 242, 243, 244, 245, 246); break; - case SKINCOLOR_DARKBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246); break; - case SKINCOLOR_JETBLACK: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 200, 201, 202, 203, 204, 205, 206, 207, 28, 28, 29, 29, 30, 30, 31, 31); break; - case SKINCOLOR_LILAC: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 120, 121, 121, 122, 122, 123, 123, 192, 192, 248, 248, 249, 249, 250, 250); break; - case SKINCOLOR_PURPLE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 192, 192, 193, 193, 194, 194, 195, 195, 196, 196, 197, 197, 198, 198, 199, 199); break; - case SKINCOLOR_LAVENDER: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255, 255); break; - case SKINCOLOR_BYZANTIUM: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 192, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31); break; - case SKINCOLOR_INDIGO: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 192, 193, 194, 195, 196, 197, 198, 199, 255, 255, 29, 29, 30, 30, 31, 31); break; + case SKINCOLOR_IVORY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 120, 120, 120, 0, 0, 0, 0, 1, 1, 2, 2, 4, 6, 8, 10); break; + case SKINCOLOR_WHITE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7); break; + case SKINCOLOR_SILVER: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); break; + case SKINCOLOR_CLOUDY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31); break; + case SKINCOLOR_GREY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23); break; + case SKINCOLOR_DARKGREY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31); break; + case SKINCOLOR_BLACK: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31); break; + case SKINCOLOR_SALMON: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 120, 121, 121, 122, 122, 123, 123, 124, 124, 125, 125, 126, 126, 127, 127); break; + case SKINCOLOR_PINK: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 144, 144, 145, 145, 146, 146, 147, 147, 148, 148, 149, 149, 150, 150, 151, 151); break; + case SKINCOLOR_LIGHTRED: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135); break; + case SKINCOLOR_SHINYRED: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143); break; + case SKINCOLOR_RED: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140); break; + case SKINCOLOR_DARKPINK: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141); break; + case SKINCOLOR_DARKRED: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 136, 136, 137, 137, 138, 138, 139, 139, 140, 140, 141, 141, 142, 142, 143, 143); break; + case SKINCOLOR_DAWN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 121, 122, 123, 124, 147, 88, 89, 149, 91, 92, 151, 94, 95, 152, 153); break; + case SKINCOLOR_ORANGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95); break; + case SKINCOLOR_SHINYORANGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 80, 81, 83, 85, 86, 88, 90, 91, 93, 95, 152, 153, 154, 156, 157, 159); break; + case SKINCOLOR_DARKORANGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 88, 89, 90, 91, 92, 93, 94, 95, 152, 153, 154, 155, 156, 157, 158, 159); break; + case SKINCOLOR_GOLDENBROWN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 112, 113, 114, 115, 116, 117, 118, 119, 156, 156, 157, 157, 158, 158, 159, 159); break; + case SKINCOLOR_ROSEWOOD: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 152, 152, 153, 153, 154, 154, 155, 155, 156, 156, 157, 157, 158, 158, 159, 159); break; + case SKINCOLOR_DARKROSEWOOD: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 152, 153, 154, 155, 156, 157, 158, 159, 139, 140, 141, 142, 143, 31, 31, 31); break; + case SKINCOLOR_SEPIA: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 3, 5, 7, 32, 9, 34, 36, 37, 39, 42, 45, 59, 60, 61, 62, 63); break; + case SKINCOLOR_BEIGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47); break; + case SKINCOLOR_BROWN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63); break; + case SKINCOLOR_LEATHER: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 57, 58, 59, 59, 60, 60, 61, 61, 62, 62, 63, 63, 28, 29, 30, 31); break; + case SKINCOLOR_YELLOW: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 97, 98, 99, 100, 101, 102, 103, 104, 113, 113, 114, 115, 115, 115, 116, 117); break; + case SKINCOLOR_PEACH: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79); break; + case SKINCOLOR_LIGHTORANGE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 80, 80, 81, 81, 82, 82, 83, 83, 84, 84, 85, 85, 86, 86, 87, 87); break; + case SKINCOLOR_CARAMEL: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 72, 73, 74, 75, 76, 77, 78, 79, 48, 49, 50, 51, 52, 53, 54, 55); break; + case SKINCOLOR_GOLD: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119, 119); break; + case SKINCOLOR_SHINYCARAMEL: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 64, 66, 68, 70, 72, 74, 76, 78, 48, 50, 52, 54, 56, 58, 60, 62); break; + case SKINCOLOR_VOMIT: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246); break; + case SKINCOLOR_GARDEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 98, 99, 112, 101, 113, 114, 106, 179, 180, 181, 182, 172, 183, 173, 174, 175); break; + case SKINCOLOR_LIGHTARMY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 176, 176, 176, 176, 177, 177, 177, 177, 178, 178, 178, 178, 179, 179, 179, 179); break; + case SKINCOLOR_ARMY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 181, 182, 182, 183, 183); break; + case SKINCOLOR_PISTACHIO: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 176, 176, 177, 177, 178, 178, 179, 179, 166, 167, 168, 169, 170, 171, 172, 173); break; + case SKINCOLOR_ROBOHOOD: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 177, 177, 178, 178, 165, 165, 167, 167, 182, 182, 171, 171, 183, 183, 173, 173); break; + case SKINCOLOR_OLIVE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, 31, 31); break; + case SKINCOLOR_DARKARMY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 176, 177, 178, 179, 170, 181, 182, 183, 173, 173, 174, 174, 175, 175, 31, 31); break; + case SKINCOLOR_LIGHTGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 160, 160, 161, 161, 162, 162, 163, 163, 164, 164, 165, 165, 166, 166, 167, 167); break; + case SKINCOLOR_UGLYGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 184, 184, 184, 184, 185, 185, 185, 185, 186, 186, 186, 186, 187, 187, 187, 187); break; + case SKINCOLOR_NEONGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 190, 191, 191); break; + case SKINCOLOR_GREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175); break; + case SKINCOLOR_DARKGREEN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 168, 168, 169, 169, 170, 170, 171, 171, 172, 172, 173, 173, 174, 174, 175, 175); break; + case SKINCOLOR_SWAMP: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 187, 187, 188, 188, 189, 189, 190, 190, 191, 191, 175, 175, 30, 30, 31, 31); break; + case SKINCOLOR_FROST: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 224, 225, 226, 212, 213, 213, 214, 215, 220, 221, 172, 222, 173, 223, 174, 175); break; + case SKINCOLOR_SLATE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 200, 200, 200, 200, 201, 201, 201, 201, 202, 202, 202, 202, 203, 203, 203, 203); break; + case SKINCOLOR_LIGHTBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 224, 224, 225, 225, 226, 226, 227, 227, 228, 228, 229, 229, 230, 230, 231, 231); break; + case SKINCOLOR_CYAN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 208, 208, 209, 210, 210, 211, 212, 213, 213, 214, 215, 216, 216, 217, 218, 219); break; + case SKINCOLOR_CERULEAN: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 216, 216, 216, 216, 217, 217, 217, 217, 218, 218, 218, 218, 219, 219, 219, 219); break; + case SKINCOLOR_TURQUOISE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 208, 208, 209, 210, 210, 211, 212, 213, 213, 214, 215, 220, 220, 221, 222, 223); break; + case SKINCOLOR_TEAL: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 220, 220, 220, 220, 221, 221, 221, 221, 222, 222, 222, 222, 223, 223, 223, 223); break; + case SKINCOLOR_STEELBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 206, 207, 207); break; + case SKINCOLOR_BLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239); break; + case SKINCOLOR_SHINYBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246); break; + case SKINCOLOR_NAVY: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 200, 201, 202, 203, 204, 205, 206, 238, 239, 240, 241, 242, 243, 244, 245, 246); break; + case SKINCOLOR_DARKBLUE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246); break; + case SKINCOLOR_JETBLACK: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 200, 201, 202, 203, 204, 205, 206, 207, 28, 28, 29, 29, 30, 30, 31, 31); break; + case SKINCOLOR_LILAC: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 120, 120, 121, 121, 122, 122, 123, 123, 192, 192, 248, 248, 249, 249, 250, 250); break; + case SKINCOLOR_PURPLE: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 192, 192, 193, 193, 194, 194, 195, 195, 196, 196, 197, 197, 198, 198, 199, 199); break; + case SKINCOLOR_LAVENDER: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255, 255); break; + case SKINCOLOR_BYZANTIUM: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 192, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31); break; + case SKINCOLOR_INDIGO: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 192, 193, 194, 195, 196, 197, 198, 199, 255, 255, 29, 29, 30, 30, 31, 31); break; /* * Removed Colors: * case SKINCOLOR_DUSK: dest_colormap[starttranscolor + i] = R_KartColorSetter(i, 192, 192, 248, 249, 250, 251, 229, 204, 230, 205, 206, 239, 240, 241, 242, 243); break; diff --git a/src/m_menu.c b/src/m_menu.c index 4e4be837..a0e4e3e8 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -5309,7 +5309,10 @@ void M_DrawTimeAttackMenu(void) soffset = 80; // Should see nothing but strings - V_DrawString(BASEVIDWIDTH - x - soffset - V_StringWidth(cv->string, 0), y, V_YELLOWMAP, cv->string); + if (cv == &cv_chooseskin) + V_DrawString(BASEVIDWIDTH - x - soffset - V_StringWidth(skins[cv_chooseskin.value-1].realname, 0), y, V_YELLOWMAP, skins[cv_chooseskin.value-1].realname); + else + V_DrawString(BASEVIDWIDTH - x - soffset - V_StringWidth(cv->string, 0), y, V_YELLOWMAP, cv->string); } else if ((currentMenu->menuitems[i].status & IT_TYPE) == IT_KEYHANDLER && cv_dummystaff.value) // bad hacky assumption: IT_KEYHANDLER is assumed to be staff ghost selector { @@ -5365,14 +5368,6 @@ void M_DrawTimeAttackMenu(void) V_DrawString(104-72, 58, V_YELLOWMAP, "TIME:"); V_DrawRightAlignedString(104+72, 58, V_ALLOWLOWERCASE, beststr); - /*if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->rings) - sprintf(beststr, "(none)"); - else - sprintf(beststr, "%hu", mainrecords[cv_nextmap.value-1]->rings); - - V_DrawString(104-72, 68, V_YELLOWMAP, "RINGS:"); - V_DrawRightAlignedString(104+72, 68, V_ALLOWLOWERCASE, beststr);*/ - // Draw record emblems. em = M_GetLevelEmblems(cv_nextmap.value); while (em) @@ -5381,7 +5376,6 @@ void M_DrawTimeAttackMenu(void) { //case ET_SCORE: yHeight = 48; break; case ET_TIME: yHeight = 58; break; - //case ET_RINGS: yHeight = 68; break; default: goto skipThisOne; } @@ -5410,8 +5404,12 @@ void M_DrawTimeAttackMenu(void) ncv = (consvar_t *)SP_TimeAttackMenu[i].itemaction; V_DrawString(x, y + SP_TimeAttackMenu[i].alphaKey, V_TRANSLUCENT, SP_TimeAttackMenu[i].text); - V_DrawString(BASEVIDWIDTH - x - 40 - V_StringWidth(ncv->string, 0), - y + SP_TimeAttackMenu[i].alphaKey, V_YELLOWMAP|V_TRANSLUCENT, ncv->string); + if (ncv == &cv_chooseskin) + V_DrawString(BASEVIDWIDTH - x - 40 - V_StringWidth(skins[cv_chooseskin.value-1].realname, 0), + y + SP_TimeAttackMenu[i].alphaKey, V_YELLOWMAP|V_TRANSLUCENT, skins[cv_chooseskin.value-1].realname); + else + V_DrawString(BASEVIDWIDTH - x - 40 - V_StringWidth(ncv->string, 0), + y + SP_TimeAttackMenu[i].alphaKey, V_YELLOWMAP|V_TRANSLUCENT, ncv->string); } } }