mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-01 06:00:45 +00:00
Correct tabs & spacing
This commit is contained in:
spherallic
parent
222e409cde
commit
edbfb92b11
3 changed files with 35 additions and 35 deletions
|
|
@ -4612,20 +4612,20 @@ const char *COLOR_ENUMS[] = {
|
||||||
"MERCURY", // SKINCOLOR_MERCURY,
|
"MERCURY", // SKINCOLOR_MERCURY,
|
||||||
"BLUEBELL", // SKINCOLOR_BLUEBELL,
|
"BLUEBELL", // SKINCOLOR_BLUEBELL,
|
||||||
"PINK", // SKINCOLOR_PINK,
|
"PINK", // SKINCOLOR_PINK,
|
||||||
"ROSEWOOD", // SKINCOLOR_ROSEWOOD,
|
"ROSEWOOD", // SKINCOLOR_ROSEWOOD,
|
||||||
"YOGURT", // SKINCOLOR_YOGURT,
|
"YOGURT", // SKINCOLOR_YOGURT,
|
||||||
"LATTE", // SKINCOLOR_LATTE,
|
"LATTE", // SKINCOLOR_LATTE,
|
||||||
"BROWN", // SKINCOLOR_BROWN,
|
"BROWN", // SKINCOLOR_BROWN,
|
||||||
"BRONZE", // SKINCOLOR_BRONZE,
|
"BRONZE", // SKINCOLOR_BRONZE,
|
||||||
"SEPIA", // SKINCOLOR_SEPIA,
|
"SEPIA", // SKINCOLOR_SEPIA,
|
||||||
"ECRU", // SKINCOLOR_ECRU,
|
"ECRU", // SKINCOLOR_ECRU,
|
||||||
"TAN", // SKINCOLOR_TAN,
|
"TAN", // SKINCOLOR_TAN,
|
||||||
"BEIGE", // SKINCOLOR_BEIGE,
|
"BEIGE", // SKINCOLOR_BEIGE,
|
||||||
"ROSEBUSH", // SKINCOLOR_ROSEBUSH,
|
"ROSEBUSH", // SKINCOLOR_ROSEBUSH,
|
||||||
"MOSS", // SKINCOLOR_MOSS,
|
"MOSS", // SKINCOLOR_MOSS,
|
||||||
"AZURE", // SKINCOLOR_AZURE,
|
"AZURE", // SKINCOLOR_AZURE,
|
||||||
"EGGPLANT", // SKINCOLOR_EGGPLANT,
|
"EGGPLANT", // SKINCOLOR_EGGPLANT,
|
||||||
"LAVENDER", // SKINCOLOR_LAVENDER,
|
"LAVENDER", // SKINCOLOR_LAVENDER,
|
||||||
|
|
||||||
// Viv's vivid colours (toast 21/07/17)
|
// Viv's vivid colours (toast 21/07/17)
|
||||||
// Tweaks & additions (Lach, sphere, Alice, MotorRoach 26/10/22)
|
// Tweaks & additions (Lach, sphere, Alice, MotorRoach 26/10/22)
|
||||||
|
|
@ -4639,7 +4639,7 @@ const char *COLOR_ENUMS[] = {
|
||||||
"KETCHUP", // SKINCOLOR_KETCHUP,
|
"KETCHUP", // SKINCOLOR_KETCHUP,
|
||||||
"PEACHY", // SKINCOLOR_PEACHY,
|
"PEACHY", // SKINCOLOR_PEACHY,
|
||||||
"QUAIL", // SKINCOLOR_QUAIL,
|
"QUAIL", // SKINCOLOR_QUAIL,
|
||||||
"FOUNDATION", // SKINCOLOR_FOUNDATION,
|
"FOUNDATION", // SKINCOLOR_FOUNDATION,
|
||||||
"SUNSET", // SKINCOLOR_SUNSET,
|
"SUNSET", // SKINCOLOR_SUNSET,
|
||||||
"COPPER", // SKINCOLOR_COPPER,
|
"COPPER", // SKINCOLOR_COPPER,
|
||||||
"APRICOT", // SKINCOLOR_APRICOT,
|
"APRICOT", // SKINCOLOR_APRICOT,
|
||||||
|
|
@ -4656,7 +4656,7 @@ const char *COLOR_ENUMS[] = {
|
||||||
"MINDARO", // SKINCOLOR_MINDARO,
|
"MINDARO", // SKINCOLOR_MINDARO,
|
||||||
"PERIDOT", // SKINCOLOR_PERIDOT,
|
"PERIDOT", // SKINCOLOR_PERIDOT,
|
||||||
"APPLE", // SKINCOLOR_APPLE,
|
"APPLE", // SKINCOLOR_APPLE,
|
||||||
"CHARTREUSE", // SKINCOLOR_CHARTREUSE,
|
"CHARTREUSE", // SKINCOLOR_CHARTREUSE,
|
||||||
"GREEN", // SKINCOLOR_GREEN,
|
"GREEN", // SKINCOLOR_GREEN,
|
||||||
"FOREST", // SKINCOLOR_FOREST,
|
"FOREST", // SKINCOLOR_FOREST,
|
||||||
"EMERALD", // SKINCOLOR_EMERALD,
|
"EMERALD", // SKINCOLOR_EMERALD,
|
||||||
|
|
@ -4673,17 +4673,17 @@ const char *COLOR_ENUMS[] = {
|
||||||
"CYAN", // SKINCOLOR_CYAN,
|
"CYAN", // SKINCOLOR_CYAN,
|
||||||
"TURQUOISE", // SKINCOLOR_TURQUOISE,
|
"TURQUOISE", // SKINCOLOR_TURQUOISE,
|
||||||
"SKY", // SKINCOLOR_SKY,
|
"SKY", // SKINCOLOR_SKY,
|
||||||
"MARINE", // SKINCOLOR_MARINE,
|
"MARINE", // SKINCOLOR_MARINE,
|
||||||
"CERULEAN", // SKINCOLOR_CERULEAN,
|
"CERULEAN", // SKINCOLOR_CERULEAN,
|
||||||
"DREAM", // SKINCOLOR_DREAM,
|
"DREAM", // SKINCOLOR_DREAM,
|
||||||
"ICY", // SKINCOLOR_ICY,
|
"ICY", // SKINCOLOR_ICY,
|
||||||
"DAYBREAK", // SKINCOLOR_DAYBREAK,
|
"DAYBREAK", // SKINCOLOR_DAYBREAK,
|
||||||
"SAPPHIRE", // SKINCOLOR_SAPPHIRE,
|
"SAPPHIRE", // SKINCOLOR_SAPPHIRE,
|
||||||
"ARCTIC", // SKINCOLOR_ARCTIC,
|
"ARCTIC", // SKINCOLOR_ARCTIC,
|
||||||
"CORNFLOWER", // SKINCOLOR_CORNFLOWER,
|
"CORNFLOWER", // SKINCOLOR_CORNFLOWER,
|
||||||
"BLUE", // SKINCOLOR_BLUE,
|
"BLUE", // SKINCOLOR_BLUE,
|
||||||
"COBALT", // SKINCOLOR_COBALT,
|
"COBALT", // SKINCOLOR_COBALT,
|
||||||
"MIDNIGHT", // SKINCOLOR_MIDNIGHT,
|
"MIDNIGHT", // SKINCOLOR_MIDNIGHT,
|
||||||
"GALAXY", // SKINCOLOR_GALAXY,
|
"GALAXY", // SKINCOLOR_GALAXY,
|
||||||
"VAPOR", // SKINCOLOR_VAPOR,
|
"VAPOR", // SKINCOLOR_VAPOR,
|
||||||
"DUSK", // SKINCOLOR_DUSK,
|
"DUSK", // SKINCOLOR_DUSK,
|
||||||
|
|
|
||||||
|
|
@ -264,16 +264,16 @@ typedef enum
|
||||||
SKINCOLOR_MERCURY,
|
SKINCOLOR_MERCURY,
|
||||||
SKINCOLOR_BLUEBELL,
|
SKINCOLOR_BLUEBELL,
|
||||||
SKINCOLOR_PINK,
|
SKINCOLOR_PINK,
|
||||||
SKINCOLOR_ROSEWOOD,
|
SKINCOLOR_ROSEWOOD,
|
||||||
SKINCOLOR_YOGURT,
|
SKINCOLOR_YOGURT,
|
||||||
SKINCOLOR_LATTE,
|
SKINCOLOR_LATTE,
|
||||||
SKINCOLOR_BROWN,
|
SKINCOLOR_BROWN,
|
||||||
SKINCOLOR_BRONZE,
|
SKINCOLOR_BRONZE,
|
||||||
SKINCOLOR_SEPIA,
|
SKINCOLOR_SEPIA,
|
||||||
SKINCOLOR_ECRU,
|
SKINCOLOR_ECRU,
|
||||||
SKINCOLOR_TAN,
|
SKINCOLOR_TAN,
|
||||||
SKINCOLOR_BEIGE,
|
SKINCOLOR_BEIGE,
|
||||||
SKINCOLOR_ROSEBUSH,
|
SKINCOLOR_ROSEBUSH,
|
||||||
SKINCOLOR_MOSS,
|
SKINCOLOR_MOSS,
|
||||||
SKINCOLOR_AZURE,
|
SKINCOLOR_AZURE,
|
||||||
SKINCOLOR_EGGPLANT,
|
SKINCOLOR_EGGPLANT,
|
||||||
|
|
|
||||||
38
src/info.c
38
src/info.c
|
|
@ -21584,25 +21584,25 @@ skincolor_t skincolors[MAXSKINCOLORS] = {
|
||||||
{"Black", {0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1b, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f}, SKINCOLOR_WHITE, 7, V_GRAYMAP, true}, // SKINCOLOR_BLACK
|
{"Black", {0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1b, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f}, SKINCOLOR_WHITE, 7, V_GRAYMAP, true}, // SKINCOLOR_BLACK
|
||||||
|
|
||||||
// Desaturated
|
// Desaturated
|
||||||
{"Aether", {0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x91, 0x91, 0x91, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xaf}, SKINCOLOR_GREY, 15, 0, true}, // SKINCOLOR_AETHER
|
{"Aether", {0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x91, 0x91, 0x91, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xaf}, SKINCOLOR_GREY, 15, 0, true}, // SKINCOLOR_AETHER
|
||||||
{"Slate", {0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0xaa, 0xaa, 0xaa, 0xab, 0xac, 0xac, 0xad, 0xad, 0xae, 0xaf}, SKINCOLOR_SILVER, 12, 0, true}, // SKINCOLOR_SLATE
|
{"Slate", {0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0xaa, 0xaa, 0xaa, 0xab, 0xac, 0xac, 0xad, 0xad, 0xae, 0xaf}, SKINCOLOR_SILVER, 12, 0, true}, // SKINCOLOR_SLATE
|
||||||
{"Mercury", { 0, 3, 4, 7, 11, 12, 14, 15, 171, 172, 173, 155, 157, 159, 253, 254}, SKINCOLOR_ECRU, 15, V_AZUREMAP, true}, // SKINCOLOR_MERCURY
|
{"Mercury", { 0, 3, 4, 7, 11, 12, 14, 15, 171, 172, 173, 155, 157, 159, 253, 254}, SKINCOLOR_ECRU, 15, V_AZUREMAP, true}, // SKINCOLOR_MERCURY
|
||||||
{"Bluebell", {0x90, 0x91, 0x92, 0x93, 0x94, 0x94, 0x95, 0xac, 0xac, 0xad, 0xad, 0xa8, 0xa8, 0xa9, 0xfd, 0xfe}, SKINCOLOR_COPPER, 4, V_BLUEMAP, true}, // SKINCOLOR_BLUEBELL
|
{"Bluebell", {0x90, 0x91, 0x92, 0x93, 0x94, 0x94, 0x95, 0xac, 0xac, 0xad, 0xad, 0xa8, 0xa8, 0xa9, 0xfd, 0xfe}, SKINCOLOR_COPPER, 4, V_BLUEMAP, true}, // SKINCOLOR_BLUEBELL
|
||||||
{"Pink", {0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0xd3, 0xd3, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0x2b, 0x2c, 0x2e}, SKINCOLOR_AZURE, 9, V_REDMAP, true}, // SKINCOLOR_PINK
|
{"Pink", {0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0xd3, 0xd3, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0x2b, 0x2c, 0x2e}, SKINCOLOR_AZURE, 9, V_REDMAP, true}, // SKINCOLOR_PINK
|
||||||
{"Rosewood", { 209, 210, 211, 212, 213, 214, 228, 230, 232, 234, 235, 237, 26, 27, 28, 29}, SKINCOLOR_SEPIA, 5, V_BROWNMAP, true}, // SKINCOLOR_ROSEWOOD
|
{"Rosewood", { 209, 210, 211, 212, 213, 214, 228, 230, 232, 234, 235, 237, 26, 27, 28, 29}, SKINCOLOR_SEPIA, 5, V_BROWNMAP, true}, // SKINCOLOR_ROSEWOOD
|
||||||
{"Yogurt", {0xd0, 0x30, 0xd8, 0xd9, 0xda, 0xdb, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe3, 0xe6, 0xe8, 0xe9}, SKINCOLOR_RUST, 7, V_BROWNMAP, true}, // SKINCOLOR_YOGURT
|
{"Yogurt", {0xd0, 0x30, 0xd8, 0xd9, 0xda, 0xdb, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe3, 0xe6, 0xe8, 0xe9}, SKINCOLOR_RUST, 7, V_BROWNMAP, true}, // SKINCOLOR_YOGURT
|
||||||
{"Latte", { 48, 217, 219, 221, 223, 224, 226, 228, 68, 69, 70, 70, 44, 45, 46, 47}, SKINCOLOR_BOTTLE, 14, V_BROWNMAP, true}, // SKINCOLOR_LATTE
|
{"Latte", { 48, 217, 219, 221, 223, 224, 226, 228, 68, 69, 70, 70, 44, 45, 46, 47}, SKINCOLOR_BOTTLE, 14, V_BROWNMAP, true}, // SKINCOLOR_LATTE
|
||||||
{"Brown", {0xdf, 0xe0, 0xe1, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef}, SKINCOLOR_TAN, 2, V_BROWNMAP, true}, // SKINCOLOR_BROWN
|
{"Brown", {0xdf, 0xe0, 0xe1, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef}, SKINCOLOR_TAN, 2, V_BROWNMAP, true}, // SKINCOLOR_BROWN
|
||||||
{"Bronze", {0xde, 0xe0, 0xe1, 0xe4, 0xe7, 0xe9, 0xeb, 0xec, 0xed, 0xed, 0xed, 0x19, 0x19, 0x1b, 0x1d, 0x1e}, SKINCOLOR_KETCHUP, 0, V_BROWNMAP, true}, // SKINCOLOR_BRONZE
|
{"Bronze", {0xde, 0xe0, 0xe1, 0xe4, 0xe7, 0xe9, 0xeb, 0xec, 0xed, 0xed, 0xed, 0x19, 0x19, 0x1b, 0x1d, 0x1e}, SKINCOLOR_KETCHUP, 0, V_BROWNMAP, true}, // SKINCOLOR_BRONZE
|
||||||
{"Sepia", { 88, 84, 85, 86, 224, 226, 228, 230, 232, 235, 236, 237, 238, 239, 28, 28}, SKINCOLOR_ROSEWOOD,5, V_BROWNMAP, true}, // SKINCOLOR_SEPIA
|
{"Sepia", { 88, 84, 85, 86, 224, 226, 228, 230, 232, 235, 236, 237, 238, 239, 28, 28}, SKINCOLOR_ROSEWOOD, 5, V_BROWNMAP, true}, // SKINCOLOR_SEPIA
|
||||||
{"Ecru", { 80, 83, 84, 85, 86, 242, 243, 245, 230, 232, 234, 236, 238, 239, 47, 47}, SKINCOLOR_MERCURY, 15, V_BROWNMAP, true}, // SKINCOLOR_ECRU
|
{"Ecru", { 80, 83, 84, 85, 86, 242, 243, 245, 230, 232, 234, 236, 238, 239, 47, 47}, SKINCOLOR_MERCURY, 15, V_BROWNMAP, true}, // SKINCOLOR_ECRU
|
||||||
{"Tan", {0x51, 0x51, 0x54, 0x54, 0x55, 0x55, 0x56, 0x56, 0x56, 0x57, 0xf5, 0xf5, 0xf9, 0xf9, 0xed, 0xed}, SKINCOLOR_BROWN, 12, V_BROWNMAP, true}, // SKINCOLOR_TAN
|
{"Tan", {0x51, 0x51, 0x54, 0x54, 0x55, 0x55, 0x56, 0x56, 0x56, 0x57, 0xf5, 0xf5, 0xf9, 0xf9, 0xed, 0xed}, SKINCOLOR_BROWN, 12, V_BROWNMAP, true}, // SKINCOLOR_TAN
|
||||||
{"Beige", {0x54, 0x55, 0x56, 0x56, 0xf2, 0xf3, 0xf3, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfb, 0xed, 0xed}, SKINCOLOR_MOSS, 5, V_BROWNMAP, true}, // SKINCOLOR_BEIGE
|
{"Beige", {0x54, 0x55, 0x56, 0x56, 0xf2, 0xf3, 0xf3, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfb, 0xed, 0xed}, SKINCOLOR_MOSS, 5, V_BROWNMAP, true}, // SKINCOLOR_BEIGE
|
||||||
{"Rosebush", { 208, 216, 209, 85, 90, 91, 91, 92, 191, 93, 94, 107, 109, 110, 111, 111}, SKINCOLOR_EGGPLANT,5, V_GREENMAP, true}, // SKINCOLOR_ROSEBUSH
|
{"Rosebush", { 208, 216, 209, 85, 90, 91, 91, 92, 191, 93, 94, 107, 109, 110, 111, 111}, SKINCOLOR_EGGPLANT, 5, V_GREENMAP, true}, // SKINCOLOR_ROSEBUSH
|
||||||
{"Moss", {0x58, 0x58, 0x59, 0x59, 0x5a, 0x5a, 0x5b, 0x5b, 0x5b, 0x5c, 0x5d, 0x5d, 0x5e, 0x5e, 0x5f, 0x5f}, SKINCOLOR_BEIGE, 13, V_GREENMAP, true}, // SKINCOLOR_MOSS
|
{"Moss", {0x58, 0x58, 0x59, 0x59, 0x5a, 0x5a, 0x5b, 0x5b, 0x5b, 0x5c, 0x5d, 0x5d, 0x5e, 0x5e, 0x5f, 0x5f}, SKINCOLOR_BEIGE, 13, V_GREENMAP, true}, // SKINCOLOR_MOSS
|
||||||
{"Azure", {0x90, 0x90, 0x91, 0x91, 0xaa, 0xaa, 0xab, 0xab, 0xab, 0xac, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf}, SKINCOLOR_PINK, 5, V_AZUREMAP, true}, // SKINCOLOR_AZURE
|
{"Azure", {0x90, 0x90, 0x91, 0x91, 0xaa, 0xaa, 0xab, 0xab, 0xab, 0xac, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf}, SKINCOLOR_PINK, 5, V_AZUREMAP, true}, // SKINCOLOR_AZURE
|
||||||
{"Eggplant", { 4, 8, 11, 11, 16, 195, 195, 195, 196, 186, 187, 187, 254, 254, 30, 31}, SKINCOLOR_ROSEBUSH,5, V_PURPLEMAP, true}, // SKINCOLOR_EGGPLANT
|
{"Eggplant", { 4, 8, 11, 11, 16, 195, 195, 195, 196, 186, 187, 187, 254, 254, 30, 31}, SKINCOLOR_ROSEBUSH, 5, V_PURPLEMAP, true}, // SKINCOLOR_EGGPLANT
|
||||||
{"Lavender", {0xc0, 0xc0, 0xc1, 0xc1, 0xc2, 0xc2, 0xc3, 0xc3, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7}, SKINCOLOR_GOLD, 4, V_PURPLEMAP, true}, // SKINCOLOR_LAVENDER
|
{"Lavender", {0xc0, 0xc0, 0xc1, 0xc1, 0xc2, 0xc2, 0xc3, 0xc3, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7}, SKINCOLOR_GOLD, 4, V_PURPLEMAP, true}, // SKINCOLOR_LAVENDER
|
||||||
|
|
||||||
// Viv's vivid colours (toast 21/07/17)
|
// Viv's vivid colours (toast 21/07/17)
|
||||||
// Tweaks & additions (Lach, sphere, Alice, MotorRoach 26/10/22)
|
// Tweaks & additions (Lach, sphere, Alice, MotorRoach 26/10/22)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue