stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-17 23:21:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'colors' into 'master'

Browse source 
Edit Pink, Navy, and Jet, add brown text

See merge request KartKrew/Kart!28
This commit is contained in:
Sryder 2018-10-07 09:39:22 -04:00
commit 64ceed280a
8 changed files with 73 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/console.c
View file

@ -154,9 +154,9 @@ static CV_PossibleValue_t menuhighlight_cons_t[] =
{V_GOLDMAP, "Always gold"}, {V_GOLDMAP, "Always gold"},
{V_LAVENDERMAP, "Always lavender"}, {V_LAVENDERMAP, "Always lavender"},
{V_TEAMAP, "Always tea-green"}, {V_TEAMAP, "Always tea-green"},
{V_STEELMAP, "Always steel"}, {V_STEELMAP, "Always steel-blue"},
{V_PINKMAP, "Always pink"}, {V_PINKMAP, "Always pink"},
{V_TEALMAP, "Always teal"}, {V_BROWNMAP, "Always brown"},
{V_PEACHMAP, "Always peach"}, {V_PEACHMAP, "Always peach"},
{0, NULL} {0, NULL}
}; };
@ -291,7 +291,7 @@ static void CONS_backcolor_Change(void)
// TODO: This could probably be improved somehow... // TODO: This could probably be improved somehow...
// These colormaps are 99% identical, with just a few changed bytes // These colormaps are 99% identical, with just a few changed bytes
UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\ UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\
*skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *tealmap, *peachmap; *skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap;
static void CON_SetupColormaps(void) static void CON_SetupColormaps(void)
{ {
@ -311,8 +311,8 @@ static void CON_SetupColormaps(void)
teamap = (goldmap+256); teamap = (goldmap+256);
steelmap = (teamap+256); steelmap = (teamap+256);
pinkmap = (steelmap+256); pinkmap = (steelmap+256);
tealmap = (pinkmap+256); brownmap = (pinkmap+256);
peachmap = (tealmap+256); peachmap = (brownmap+256);
// setup the other colormaps, for console text // setup the other colormaps, for console text
@ -335,8 +335,8 @@ static void CON_SetupColormaps(void)
goldmap[120] = (UINT8)114; goldmap[120] = (UINT8)114;
teamap[120] = (UINT8)177; teamap[120] = (UINT8)177;
steelmap[120] = (UINT8)201; steelmap[120] = (UINT8)201;
pinkmap[120] = (UINT8)124; pinkmap[120] = (UINT8)145;
tealmap[120] = (UINT8)220; brownmap[120] = (UINT8)48;
peachmap[120] = (UINT8)69; // nice peachmap[120] = (UINT8)69; // nice
// Init back colormap // Init back colormap

2
src/console.h
View file

@ -39,7 +39,7 @@ extern UINT32 con_scalefactor; // console text scale factor
extern consvar_t cons_backcolor, cons_menuhighlight; extern consvar_t cons_backcolor, cons_menuhighlight;
extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\ extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\
*skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *tealmap, *peachmap; *skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap;
// Console bg color (auto updated to match) // Console bg color (auto updated to match)
extern UINT8 *consolebgmap; extern UINT8 *consolebgmap;

34
src/dehacked.c
View file

@ -7620,9 +7620,9 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
"SALMON", // 10 // SKINCOLOR_SALMON "SALMON", // 10 // SKINCOLOR_SALMON
"PINK", // 11 // SKINCOLOR_PINK "PINK", // 11 // SKINCOLOR_PINK
"ROSE", // 12 // SKINCOLOR_ROSE "ROSE", // 12 // SKINCOLOR_ROSE
"RASPBERRY", // 13 // SKINCOLOR_RASPBERRY "RUBY", // 13 // SKINCOLOR_RUBY
"RED", // 14 // SKINCOLOR_RED "RASPBERRY", // 14 // SKINCOLOR_RASPBERRY
"RUBY", // 15 // SKINCOLOR_RUBY "RED", // 15 // SKINCOLOR_RED
"CRIMSON", // 16 // SKINCOLOR_CRIMSON "CRIMSON", // 16 // SKINCOLOR_CRIMSON
"KETCHUP", // 17 // SKINCOLOR_KETCHUP "KETCHUP", // 17 // SKINCOLOR_KETCHUP
"DAWN", // 18 // SKINCOLOR_DAWN "DAWN", // 18 // SKINCOLOR_DAWN
@ -7642,16 +7642,16 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
"VOMIT", // 32 // SKINCOLOR_VOMIT "VOMIT", // 32 // SKINCOLOR_VOMIT
"GARDEN", // 33 // SKINCOLOR_GARDEN "GARDEN", // 33 // SKINCOLOR_GARDEN
"LIME", // 34 // SKINCOLOR_LIME "LIME", // 34 // SKINCOLOR_LIME
"DREAM", // 35 // SKINCOLOR_DREAM "TEA", // 35 // SKINCOLOR_TEA
"TEA", // 36 // SKINCOLOR_TEA "PISTACHIO", // 36 // SKINCOLOR_PISTACHIO
"PISTACHIO", // 37 // SKINCOLOR_PISTACHIO "ROBOHOOD", // 37 // SKINCOLOR_ROBOHOOD
"ROBOHOOD", // 38 // SKINCOLOR_ROBOHOOD "MOSS", // 38 // SKINCOLOR_MOSS
"MOSS", // 39 // SKINCOLOR_MOSS "MINT", // 39 // SKINCOLOR_MINT
"MINT", // 40 // SKINCOLOR_MINT "GREEN", // 40 // SKINCOLOR_GREEN
"GREEN", // 41 // SKINCOLOR_GREEN "PINETREE", // 41 // SKINCOLOR_PINETREE
"PINETREE", // 42 // SKINCOLOR_PINETREE "EMERALD", // 42 // SKINCOLOR_EMERALD
"EMERALD", // 43 // SKINCOLOR_EMERALD "SWAMP", // 43 // SKINCOLOR_SWAMP
"SWAMP", // 44 // SKINCOLOR_SWAMP "DREAM", // 44 // SKINCOLOR_DREAM
"AQUA", // 45 // SKINCOLOR_AQUA "AQUA", // 45 // SKINCOLOR_AQUA
"TEAL", // 46 // SKINCOLOR_TEAL "TEAL", // 46 // SKINCOLOR_TEAL
"CYAN", // 47 // SKINCOLOR_CYAN "CYAN", // 47 // SKINCOLOR_CYAN
@ -7661,9 +7661,9 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
"SLATE", // 51 // SKINCOLOR_SLATE "SLATE", // 51 // SKINCOLOR_SLATE
"STEEL", // 52 // SKINCOLOR_STEEL "STEEL", // 52 // SKINCOLOR_STEEL
"JET", // 53 // SKINCOLOR_JET "JET", // 53 // SKINCOLOR_JET
"PERIWINKLE", // 54 // SKINCOLOR_PERIWINKLE "SAPPHIRE", // 54 // SKINCOLOR_SAPPHIRE
"BLUE", // 55 // SKINCOLOR_BLUE "PERIWINKLE", // 55 // SKINCOLOR_PERIWINKLE
"SAPPHIRE", // 56 // SKINCOLOR_SAPPHIRE "BLUE", // 56 // SKINCOLOR_BLUE
"BLUEBERRY", // 57 // SKINCOLOR_BLUEBERRY "BLUEBERRY", // 57 // SKINCOLOR_BLUEBERRY
"DUSK", // 58 // SKINCOLOR_DUSK "DUSK", // 58 // SKINCOLOR_DUSK
"PURPLE", // 59 // SKINCOLOR_PURPLE "PURPLE", // 59 // SKINCOLOR_PURPLE
@ -8272,7 +8272,7 @@ struct {
{"V_TEAMAP",V_TEAMAP}, {"V_TEAMAP",V_TEAMAP},
{"V_STEELMAP",V_STEELMAP}, {"V_STEELMAP",V_STEELMAP},
{"V_PINKMAP",V_PINKMAP}, {"V_PINKMAP",V_PINKMAP},
{"V_TEALMAP",V_TEALMAP}, {"V_BROWNMAP",V_BROWNMAP},
{"V_PEACHMAP",V_PEACHMAP}, {"V_PEACHMAP",V_PEACHMAP},
{"V_TRANSLUCENT",V_TRANSLUCENT}, {"V_TRANSLUCENT",V_TRANSLUCENT},
{"V_10TRANS",V_10TRANS}, {"V_10TRANS",V_10TRANS},

6
src/doomdef.h
View file

@ -244,9 +244,9 @@ typedef enum
SKINCOLOR_SALMON, SKINCOLOR_SALMON,
SKINCOLOR_PINK, SKINCOLOR_PINK,
SKINCOLOR_ROSE, SKINCOLOR_ROSE,
SKINCOLOR_RUBY,
SKINCOLOR_RASPBERRY, SKINCOLOR_RASPBERRY,
SKINCOLOR_RED, SKINCOLOR_RED,
SKINCOLOR_RUBY,
SKINCOLOR_CRIMSON, SKINCOLOR_CRIMSON,
SKINCOLOR_KETCHUP, SKINCOLOR_KETCHUP,
SKINCOLOR_DAWN, SKINCOLOR_DAWN,
@ -266,7 +266,6 @@ typedef enum
SKINCOLOR_VOMIT, SKINCOLOR_VOMIT,
SKINCOLOR_GARDEN, SKINCOLOR_GARDEN,
SKINCOLOR_LIME, SKINCOLOR_LIME,
SKINCOLOR_DREAM,
SKINCOLOR_TEA, SKINCOLOR_TEA,
SKINCOLOR_PISTACHIO, SKINCOLOR_PISTACHIO,
SKINCOLOR_ROBOHOOD, SKINCOLOR_ROBOHOOD,
@ -276,6 +275,7 @@ typedef enum
SKINCOLOR_PINETREE, SKINCOLOR_PINETREE,
SKINCOLOR_EMERALD, SKINCOLOR_EMERALD,
SKINCOLOR_SWAMP, SKINCOLOR_SWAMP,
SKINCOLOR_DREAM,
SKINCOLOR_AQUA, SKINCOLOR_AQUA,
SKINCOLOR_TEAL, SKINCOLOR_TEAL,
SKINCOLOR_CYAN, SKINCOLOR_CYAN,
@ -285,9 +285,9 @@ typedef enum
SKINCOLOR_SLATE, SKINCOLOR_SLATE,
SKINCOLOR_STEEL, SKINCOLOR_STEEL,
SKINCOLOR_JET, SKINCOLOR_JET,
SKINCOLOR_SAPPHIRE, // sweet mother, i cannot weave – slender aphrodite has overcome me with longing for a girl
SKINCOLOR_PERIWINKLE, SKINCOLOR_PERIWINKLE,
SKINCOLOR_BLUE, SKINCOLOR_BLUE,
SKINCOLOR_SAPPHIRE, // sweet mother, i cannot weave – slender aphrodite has overcome me with longing for a girl
SKINCOLOR_BLUEBERRY, SKINCOLOR_BLUEBERRY,
SKINCOLOR_DUSK, SKINCOLOR_DUSK,
SKINCOLOR_PURPLE, SKINCOLOR_PURPLE,

10
src/hu_stuff.c
View file

@ -743,10 +743,10 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
const UINT8 color = players[playernum].skincolor; const UINT8 color = players[playernum].skincolor;
if (color <= SKINCOLOR_SILVER || color == SKINCOLOR_SLATE) if (color <= SKINCOLOR_SILVER || color == SKINCOLOR_SLATE)
cstart = "\x80"; // white cstart = "\x80"; // white
else if (color <= SKINCOLOR_BEIGE || color == SKINCOLOR_JET) else if (color <= SKINCOLOR_BLACK || color == SKINCOLOR_JET)
cstart = "\x86"; // V_GRAYMAP cstart = "\x86"; // V_GRAYMAP
else if (color <= SKINCOLOR_LEATHER) else if (color <= SKINCOLOR_LEATHER)
cstart = "\x8A"; // V_GOLDMAP cstart = "\x8e"; // V_BROWNMAP
else if (color <= SKINCOLOR_ROSE || color == SKINCOLOR_LILAC) else if (color <= SKINCOLOR_ROSE || color == SKINCOLOR_LILAC)
cstart = "\x8d"; // V_PINKMAP cstart = "\x8d"; // V_PINKMAP
else if (color <= SKINCOLOR_KETCHUP) else if (color <= SKINCOLOR_KETCHUP)
@ -757,14 +757,12 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
cstart = "\x8f"; // V_PEACHMAP cstart = "\x8f"; // V_PEACHMAP
else if (color <= SKINCOLOR_BRONZE) else if (color <= SKINCOLOR_BRONZE)
cstart = "\x8A"; // V_GOLDMAP cstart = "\x8A"; // V_GOLDMAP
else if (color <= SKINCOLOR_MUSTARD) else if (color <= SKINCOLOR_OLIVE)
cstart = "\x82"; // V_YELLOWMAP cstart = "\x82"; // V_YELLOWMAP
else if (color <= SKINCOLOR_PISTACHIO) else if (color <= SKINCOLOR_PISTACHIO)
cstart = "\x8b"; // V_TEAMAP cstart = "\x8b"; // V_TEAMAP
else if (color <= SKINCOLOR_SWAMP || color == SKINCOLOR_LIME) else if (color <= SKINCOLOR_DREAM || color == SKINCOLOR_LIME)
cstart = "\x83"; // V_GREENMAP cstart = "\x83"; // V_GREENMAP
else if (color <= SKINCOLOR_TEAL)
cstart = "\x8e"; // V_TEALMAP
else if (color <= SKINCOLOR_NAVY || color == SKINCOLOR_SAPPHIRE) else if (color <= SKINCOLOR_NAVY || color == SKINCOLOR_SAPPHIRE)
cstart = "\x88"; // V_SKYMAP cstart = "\x88"; // V_SKYMAP
else if (color <= SKINCOLOR_STEEL) else if (color <= SKINCOLOR_STEEL)

76
src/k_kart.c
View file

@ -55,9 +55,9 @@ const char *KartColor_Names[MAXSKINCOLORS] =
"Salmon", // 10 // SKINCOLOR_SALMON "Salmon", // 10 // SKINCOLOR_SALMON
"Pink", // 11 // SKINCOLOR_PINK "Pink", // 11 // SKINCOLOR_PINK
"Rose", // 12 // SKINCOLOR_ROSE "Rose", // 12 // SKINCOLOR_ROSE
"Raspberry", // 13 // SKINCOLOR_RASPBERRY "Ruby", // 13 // SKINCOLOR_RUBY
"Red", // 14 // SKINCOLOR_RED "Raspberry", // 14 // SKINCOLOR_RASPBERRY
"Ruby", // 15 // SKINCOLOR_RUBY "Red", // 15 // SKINCOLOR_RED
"Crimson", // 16 // SKINCOLOR_CRIMSON "Crimson", // 16 // SKINCOLOR_CRIMSON
"Ketchup", // 17 // SKINCOLOR_KETCHUP "Ketchup", // 17 // SKINCOLOR_KETCHUP
"Dawn", // 18 // SKINCOLOR_DAWN "Dawn", // 18 // SKINCOLOR_DAWN
@ -77,16 +77,16 @@ const char *KartColor_Names[MAXSKINCOLORS] =
"Vomit", // 32 // SKINCOLOR_VOMIT "Vomit", // 32 // SKINCOLOR_VOMIT
"Garden", // 33 // SKINCOLOR_GARDEN "Garden", // 33 // SKINCOLOR_GARDEN
"Lime", // 34 // SKINCOLOR_LIME "Lime", // 34 // SKINCOLOR_LIME
"Dream", // 35 // SKINCOLOR_DREAM "Tea", // 35 // SKINCOLOR_TEA
"Tea", // 36 // SKINCOLOR_TEA "Pistachio", // 36 // SKINCOLOR_PISTACHIO
"Pistachio", // 37 // SKINCOLOR_PISTACHIO "Robo-Hood", // 37 // SKINCOLOR_ROBOHOOD
"Robo-Hood", // 38 // SKINCOLOR_ROBOHOOD "Moss", // 38 // SKINCOLOR_MOSS
"Moss", // 39 // SKINCOLOR_MOSS "Mint", // 39 // SKINCOLOR_MINT
"Mint", // 40 // SKINCOLOR_MINT "Green", // 40 // SKINCOLOR_GREEN
"Green", // 41 // SKINCOLOR_GREEN "Pinetree", // 41 // SKINCOLOR_PINETREE
"Pinetree", // 42 // SKINCOLOR_PINETREE "Emerald", // 42 // SKINCOLOR_EMERALD
"Emerald", // 43 // SKINCOLOR_EMERALD "Swamp", // 43 // SKINCOLOR_SWAMP
"Swamp", // 44 // SKINCOLOR_SWAMP "Dream", // 44 // SKINCOLOR_DREAM
"Aqua", // 45 // SKINCOLOR_AQUA "Aqua", // 45 // SKINCOLOR_AQUA
"Teal", // 46 // SKINCOLOR_TEAL "Teal", // 46 // SKINCOLOR_TEAL
"Cyan", // 47 // SKINCOLOR_CYAN "Cyan", // 47 // SKINCOLOR_CYAN
@ -96,9 +96,9 @@ const char *KartColor_Names[MAXSKINCOLORS] =
"Slate", // 51 // SKINCOLOR_SLATE "Slate", // 51 // SKINCOLOR_SLATE
"Steel", // 52 // SKINCOLOR_STEEL "Steel", // 52 // SKINCOLOR_STEEL
"Jet", // 53 // SKINCOLOR_JET "Jet", // 53 // SKINCOLOR_JET
"Periwinkle", // 54 // SKINCOLOR_PERIWINKLE "Sapphire", // 54 // SKINCOLOR_SAPPHIRE
"Blue", // 55 // SKINCOLOR_BLUE "Periwinkle", // 55 // SKINCOLOR_PERIWINKLE
"Sapphire", // 56 // SKINCOLOR_SAPPHIRE "Blue", // 56 // SKINCOLOR_BLUE
"Blueberry", // 57 // SKINCOLOR_BLUEBERRY "Blueberry", // 57 // SKINCOLOR_BLUEBERRY
"Dusk", // 58 // SKINCOLOR_DUSK "Dusk", // 58 // SKINCOLOR_DUSK
"Purple", // 59 // SKINCOLOR_PURPLE "Purple", // 59 // SKINCOLOR_PURPLE
@ -124,9 +124,9 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
SKINCOLOR_TEA,8, // 10 // SKINCOLOR_SALMON SKINCOLOR_TEA,8, // 10 // SKINCOLOR_SALMON
SKINCOLOR_PISTACHIO,8, // 11 // SKINCOLOR_PINK SKINCOLOR_PISTACHIO,8, // 11 // SKINCOLOR_PINK
SKINCOLOR_MOSS,8, // 12 // SKINCOLOR_ROSE SKINCOLOR_MOSS,8, // 12 // SKINCOLOR_ROSE
SKINCOLOR_MINT,8, // 13 // SKINCOLOR_RASPBERRY SKINCOLOR_SAPPHIRE,8, // 13 // SKINCOLOR_RUBY
SKINCOLOR_GREEN,6, // 14 // SKINCOLOR_RED SKINCOLOR_MINT,8, // 14 // SKINCOLOR_RASPBERRY
SKINCOLOR_SAPPHIRE,8, // 15 // SKINCOLOR_RUBY SKINCOLOR_GREEN,6, // 15 // SKINCOLOR_RED
SKINCOLOR_PINETREE,6, // 16 // SKINCOLOR_CRIMSON SKINCOLOR_PINETREE,6, // 16 // SKINCOLOR_CRIMSON
SKINCOLOR_MUSTARD,10, // 17 // SKINCOLOR_KETCHUP SKINCOLOR_MUSTARD,10, // 17 // SKINCOLOR_KETCHUP
SKINCOLOR_DUSK,8, // 18 // SKINCOLOR_DAWN SKINCOLOR_DUSK,8, // 18 // SKINCOLOR_DAWN
@ -146,16 +146,16 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
SKINCOLOR_ROBOHOOD,8, // 32 // SKINCOLOR_VOMIT SKINCOLOR_ROBOHOOD,8, // 32 // SKINCOLOR_VOMIT
SKINCOLOR_LAVENDER,6, // 33 // SKINCOLOR_GARDEN SKINCOLOR_LAVENDER,6, // 33 // SKINCOLOR_GARDEN
SKINCOLOR_TANGERINE,8, // 34 // SKINCOLOR_LIME SKINCOLOR_TANGERINE,8, // 34 // SKINCOLOR_LIME
SKINCOLOR_POMEGRANATE,8, // 35 // SKINCOLOR_DREAM SKINCOLOR_SALMON,8, // 35 // SKINCOLOR_TEA
SKINCOLOR_SALMON,8, // 36 // SKINCOLOR_TEA SKINCOLOR_PINK,6, // 36 // SKINCOLOR_PISTACHIO
SKINCOLOR_PINK,6, // 37 // SKINCOLOR_PISTACHIO SKINCOLOR_VOMIT,8, // 37 // SKINCOLOR_ROBOHOOD
SKINCOLOR_VOMIT,8, // 38 // SKINCOLOR_ROBOHOOD SKINCOLOR_ROSE,8, // 38 // SKINCOLOR_MOSS
SKINCOLOR_ROSE,8, // 39 // SKINCOLOR_MOSS SKINCOLOR_RASPBERRY,8, // 39 // SKINCOLOR_MINT
SKINCOLOR_RASPBERRY,8, // 40 // SKINCOLOR_MINT SKINCOLOR_RED,8, // 40 // SKINCOLOR_GREEN
SKINCOLOR_RED,8, // 41 // SKINCOLOR_GREEN SKINCOLOR_CRIMSON,8, // 41 // SKINCOLOR_PINETREE
SKINCOLOR_CRIMSON,8, // 42 // SKINCOLOR_PINETREE SKINCOLOR_PURPLE,8, // 42 // SKINCOLOR_EMERALD
SKINCOLOR_PURPLE,8, // 43 // SKINCOLOR_EMERALD SKINCOLOR_BYZANTIUM,8, // 43 // SKINCOLOR_SWAMP
SKINCOLOR_BYZANTIUM,8, // 44 // SKINCOLOR_SWAMP SKINCOLOR_POMEGRANATE,8, // 44 // SKINCOLOR_DREAM
SKINCOLOR_YELLOW,8, // 45 // SKINCOLOR_AQUA SKINCOLOR_YELLOW,8, // 45 // SKINCOLOR_AQUA
SKINCOLOR_OLIVE,8, // 46 // SKINCOLOR_TEAL SKINCOLOR_OLIVE,8, // 46 // SKINCOLOR_TEAL
SKINCOLOR_PEACH,8, // 47 // SKINCOLOR_CYAN SKINCOLOR_PEACH,8, // 47 // SKINCOLOR_CYAN
@ -165,9 +165,9 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
SKINCOLOR_GOLD,10, // 51 // SKINCOLOR_SLATE SKINCOLOR_GOLD,10, // 51 // SKINCOLOR_SLATE
SKINCOLOR_BRONZE,10, // 52 // SKINCOLOR_STEEL SKINCOLOR_BRONZE,10, // 52 // SKINCOLOR_STEEL
SKINCOLOR_BURGUNDY,8, // 53 // SKINCOLOR_JET SKINCOLOR_BURGUNDY,8, // 53 // SKINCOLOR_JET
SKINCOLOR_CREAMSICLE,8, // 54 // SKINCOLOR_PERIWINKLE SKINCOLOR_RUBY,6, // 54 // SKINCOLOR_SAPPHIRE
SKINCOLOR_ORANGE,8, // 55 // SKINCOLOR_BLUE SKINCOLOR_CREAMSICLE,8, // 55 // SKINCOLOR_PERIWINKLE
SKINCOLOR_RUBY,6, // 56 // SKINCOLOR_SAPPHIRE SKINCOLOR_ORANGE,8, // 56 // SKINCOLOR_BLUE
SKINCOLOR_PUMPKIN,8, // 57 // SKINCOLOR_BLUEBERRY SKINCOLOR_PUMPKIN,8, // 57 // SKINCOLOR_BLUEBERRY
SKINCOLOR_DAWN,6, // 58 // SKINCOLOR_DUSK SKINCOLOR_DAWN,6, // 58 // SKINCOLOR_DUSK
SKINCOLOR_EMERALD,8, // 59 // SKINCOLOR_PURPLE SKINCOLOR_EMERALD,8, // 59 // SKINCOLOR_PURPLE
@ -189,11 +189,11 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = {
{ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63}, // SKINCOLOR_BROWN { 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63}, // SKINCOLOR_BROWN
{ 51, 52, 53, 55, 56, 57, 58, 60, 61, 63, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_LEATHER { 51, 52, 53, 55, 56, 57, 58, 60, 61, 63, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_LEATHER
{120, 120, 120, 121, 121, 122, 122, 123, 124, 125, 126, 128, 129, 131, 133, 135}, // SKINCOLOR_SALMON {120, 120, 120, 121, 121, 122, 122, 123, 124, 125, 126, 128, 129, 131, 133, 135}, // SKINCOLOR_SALMON
{121, 121, 144, 144, 145, 145, 146, 146, 147, 148, 149, 150, 151, 134, 136, 138}, // SKINCOLOR_PINK {120, 121, 121, 122, 144, 145, 146, 147, 148, 149, 150, 151, 134, 136, 138, 140}, // SKINCOLOR_PINK
{144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141}, // SKINCOLOR_ROSE {144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141}, // SKINCOLOR_ROSE
{121, 122, 145, 146, 147, 149, 131, 132, 133, 134, 135, 197, 197, 198, 199, 255}, // SKINCOLOR_RUBY
{120, 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 133, 134, 136, 137, 139}, // SKINCOLOR_RASPBERRY {120, 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 133, 134, 136, 137, 139}, // SKINCOLOR_RASPBERRY
{125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140}, // SKINCOLOR_RED {125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140}, // SKINCOLOR_RED
{121, 122, 145, 146, 147, 149, 131, 132, 133, 134, 135, 197, 197, 198, 199, 255}, // SKINCOLOR_RUBY
{130, 131, 132, 133, 134, 136, 137, 138, 139, 139, 140, 140, 141, 141, 142, 143}, // SKINCOLOR_CRIMSON {130, 131, 132, 133, 134, 136, 137, 138, 139, 139, 140, 140, 141, 141, 142, 143}, // SKINCOLOR_CRIMSON
{104, 113, 113, 85, 86, 88, 128, 129, 131, 133, 134, 136, 138, 139, 141, 143}, // SKINCOLOR_KETCHUP {104, 113, 113, 85, 86, 88, 128, 129, 131, 133, 134, 136, 138, 139, 141, 143}, // SKINCOLOR_KETCHUP
{120, 121, 122, 123, 124, 147, 147, 148, 90, 91, 92, 93, 94, 95, 152, 154}, // SKINCOLOR_DAWN {120, 121, 122, 123, 124, 147, 147, 148, 90, 91, 92, 93, 94, 95, 152, 154}, // SKINCOLOR_DAWN
@ -213,7 +213,6 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = {
{121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246}, // SKINCOLOR_VOMIT {121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246}, // SKINCOLOR_VOMIT
{ 98, 99, 112, 101, 113, 114, 106, 179, 180, 180, 181, 182, 183, 173, 174, 175}, // SKINCOLOR_GARDEN { 98, 99, 112, 101, 113, 114, 106, 179, 180, 180, 181, 182, 183, 173, 174, 175}, // SKINCOLOR_GARDEN
{ 96, 97, 99, 100, 102, 104, 160, 162, 164, 166, 168, 171, 223, 223, 207, 31}, // SKINCOLOR_LIME { 96, 97, 99, 100, 102, 104, 160, 162, 164, 166, 168, 171, 223, 223, 207, 31}, // SKINCOLOR_LIME
{120, 120, 80, 80, 81, 177, 162, 164, 228, 228, 204, 204, 205, 205, 206, 207}, // SKINCOLOR_DREAM
{120, 120, 176, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 182, 183}, // SKINCOLOR_TEA {120, 120, 176, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 182, 183}, // SKINCOLOR_TEA
{120, 120, 176, 176, 177, 177, 178, 179, 165, 166, 167, 168, 169, 170, 171, 172}, // SKINCOLOR_PISTACHIO {120, 120, 176, 176, 177, 177, 178, 179, 165, 166, 167, 168, 169, 170, 171, 172}, // SKINCOLOR_PISTACHIO
{176, 176, 177, 178, 165, 166, 167, 167, 168, 169, 182, 182, 182, 183, 183, 183}, // SKINCOLOR_ROBOHOOD {176, 176, 177, 178, 165, 166, 167, 167, 168, 169, 182, 182, 182, 183, 183, 183}, // SKINCOLOR_ROBOHOOD
@ -223,18 +222,19 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = {
{160, 161, 162, 164, 165, 167, 169, 170, 171, 171, 172, 173, 174, 175, 30, 31}, // SKINCOLOR_PINETREE {160, 161, 162, 164, 165, 167, 169, 170, 171, 171, 172, 173, 174, 175, 30, 31}, // SKINCOLOR_PINETREE
{160, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 191, 175}, // SKINCOLOR_EMERALD {160, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 191, 175}, // SKINCOLOR_EMERALD
{186, 187, 188, 188, 188, 189, 189, 190, 190, 191, 175, 175, 30, 30, 31, 31}, // SKINCOLOR_SWAMP {186, 187, 188, 188, 188, 189, 189, 190, 190, 191, 175, 175, 30, 30, 31, 31}, // SKINCOLOR_SWAMP
{120, 120, 80, 80, 81, 177, 162, 164, 228, 228, 204, 204, 205, 205, 206, 207}, // SKINCOLOR_DREAM
{120, 208, 208, 210, 212, 214, 220, 220, 220, 221, 221, 222, 222, 223, 223, 191}, // SKINCOLOR_AQUA {120, 208, 208, 210, 212, 214, 220, 220, 220, 221, 221, 222, 222, 223, 223, 191}, // SKINCOLOR_AQUA
{210, 213, 220, 220, 220, 216, 216, 221, 221, 221, 222, 222, 223, 223, 191, 31}, // SKINCOLOR_TEAL {210, 213, 220, 220, 220, 216, 216, 221, 221, 221, 222, 222, 223, 223, 191, 31}, // SKINCOLOR_TEAL
{120, 120, 208, 208, 209, 210, 211, 212, 213, 215, 216, 217, 218, 219, 222, 223}, // SKINCOLOR_CYAN {120, 120, 208, 208, 209, 210, 211, 212, 213, 215, 216, 217, 218, 219, 222, 223}, // SKINCOLOR_CYAN
{120, 120, 208, 209, 210, 226, 215, 216, 217, 229, 229, 205, 205, 206, 207, 31}, // SKINCOLOR_JAWZ {120, 120, 208, 209, 210, 226, 215, 216, 217, 229, 229, 205, 205, 206, 207, 31}, // SKINCOLOR_JAWZ
{208, 209, 211, 213, 215, 216, 216, 217, 217, 218, 218, 219, 205, 206, 207, 207}, // SKINCOLOR_CERULEAN {208, 209, 211, 213, 215, 216, 216, 217, 217, 218, 218, 219, 205, 206, 207, 207}, // SKINCOLOR_CERULEAN
{215, 215, 215, 216, 216, 217, 218, 204, 204, 205, 205, 206, 207, 29, 30, 31}, // SKINCOLOR_NAVY {211, 212, 213, 215, 216, 218, 219, 205, 206, 206, 207, 207, 28, 29, 30, 31}, // SKINCOLOR_NAVY
{120, 120, 200, 200, 200, 201, 201, 201, 202, 202, 202, 203, 204, 205, 206, 207}, // SKINCOLOR_SLATE {120, 120, 200, 200, 200, 201, 201, 201, 202, 202, 202, 203, 204, 205, 206, 207}, // SKINCOLOR_SLATE
{120, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 207, 31}, // SKINCOLOR_STEEL {120, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 207, 31}, // SKINCOLOR_STEEL
{200, 201, 202, 203, 204, 205, 206, 207, 28, 28, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_JET {225, 226, 227, 228, 229, 205, 205, 206, 207, 207, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_JET
{208, 209, 211, 213, 215, 217, 229, 230, 232, 234, 236, 238, 240, 242, 244, 246}, // SKINCOLOR_SAPPHIRE
{120, 224, 225, 226, 226, 227, 228, 228, 229, 230, 231, 234, 235, 237, 239, 241}, // SKINCOLOR_PERIWINKLE {120, 224, 225, 226, 226, 227, 228, 228, 229, 230, 231, 234, 235, 237, 239, 241}, // SKINCOLOR_PERIWINKLE
{224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239}, // SKINCOLOR_BLUE {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239}, // SKINCOLOR_BLUE
{208, 209, 211, 213, 215, 217, 229, 230, 232, 234, 236, 238, 240, 242, 244, 246}, // SKINCOLOR_SAPPHIRE
{228, 229, 230, 231, 232, 233, 234, 235, 237, 238, 239, 240, 242, 243, 244, 245}, // SKINCOLOR_BLUEBERRY {228, 229, 230, 231, 232, 233, 234, 235, 237, 238, 239, 240, 242, 243, 244, 245}, // SKINCOLOR_BLUEBERRY
{192, 192, 248, 249, 250, 251, 204, 204, 205, 205, 206, 206, 207, 29, 30, 31}, // SKINCOLOR_DUSK {192, 192, 248, 249, 250, 251, 204, 204, 205, 205, 206, 206, 207, 29, 30, 31}, // SKINCOLOR_DUSK
{192, 192, 192, 193, 193, 194, 194, 195, 195, 196, 196, 197, 197, 198, 198, 199}, // SKINCOLOR_PURPLE {192, 192, 192, 193, 193, 194, 194, 195, 195, 196, 196, 197, 197, 198, 198, 199}, // SKINCOLOR_PURPLE

4
src/v_video.c
View file

@ -1282,8 +1282,8 @@ UINT8 *V_GetStringColormap(INT32 colorflags)
return steelmap; return steelmap;
case 13: // 0x8D, pink case 13: // 0x8D, pink
return pinkmap; return pinkmap;
case 14: // 0x8E, teal case 14: // 0x8E, brown
return tealmap; return brownmap;
case 15: // 0x8F, peach case 15: // 0x8F, peach
return peachmap; return peachmap;
default: // reset default: // reset

2
src/v_video.h
View file

@ -82,7 +82,7 @@ extern UINT8 hudtrans;
#define V_TEAMAP 0x0000B000 #define V_TEAMAP 0x0000B000
#define V_STEELMAP 0x0000C000 #define V_STEELMAP 0x0000C000
#define V_PINKMAP 0x0000D000 #define V_PINKMAP 0x0000D000
#define V_TEALMAP 0x0000E000 #define V_BROWNMAP 0x0000E000
#define V_PEACHMAP 0x0000F000 #define V_PEACHMAP 0x0000F000
// use bits 17-20 for alpha transparency // use bits 17-20 for alpha transparency