From 83c4017993eb3597e13e854d402fcd4652c6c8a7 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 21 Oct 2019 08:35:17 -0400 Subject: [PATCH] Another round of small color tweaks --- src/d_main.c | 2 +- src/dehacked.c | 6 +++--- src/doomdef.h | 6 +++--- src/g_game.c | 2 +- src/hu_stuff.c | 6 +++--- src/k_kart.c | 22 +++++++++++----------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 597eea87c..b5d4245a3 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -525,7 +525,7 @@ static void D_Display(void) } if (demo.rewinding) - V_DrawFadeScreen(TC_RAINBOW, (leveltime & 0x20) ? SKINCOLOR_PASTEL : SKINCOLOR_MOONSLAM); + V_DrawFadeScreen(TC_RAINBOW, (leveltime & 0x20) ? SKINCOLOR_PASTEL : SKINCOLOR_MOONSET); // vid size change is now finished if it was on... vid.recalc = 0; diff --git a/src/dehacked.c b/src/dehacked.c index 5f9249d89..93ff13b73 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -8242,7 +8242,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart. "SCARLET", // SKINCOLOR_SCARLET "KETCHUP", // SKINCOLOR_KETCHUP "DAWN", // SKINCOLOR_DAWN - "SUNSET", // SKINCOLOR_SUNSET + "SUNSLAM", // SKINCOLOR_SUNSLAM "CREAMSICLE", // SKINCOLOR_CREAMSICLE "ORANGE", // SKINCOLOR_ORANGE "ROSEWOOD", // SKINCOLOR_ROSEWOOD @@ -8302,9 +8302,9 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart. "THISTLE", // SKINCOLOR_THISTLE "PURPLE", // SKINCOLOR_PURPLE "PASTEL", // SKINCOLOR_PASTEL - "MOONSLAM", // SKINCOLOR_MOONSLAM + "MOONSET", // SKINCOLOR_MOONSET "DUSK", // SKINCOLOR_DUSK - "BUBBLEGUM", // SKINCOLOR_BUBBLEGUM + "VIOLET", // SKINCOLOR_VIOLET "MAGENTA", // SKINCOLOR_MAGENTA "FUCHSIA", // SKINCOLOR_FUCHSIA "TOXIC", // SKINCOLOR_TOXIC diff --git a/src/doomdef.h b/src/doomdef.h index e1e9ab13d..bb21e3d0f 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -280,7 +280,7 @@ typedef enum SKINCOLOR_SCARLET, SKINCOLOR_KETCHUP, SKINCOLOR_DAWN, - SKINCOLOR_SUNSET, + SKINCOLOR_SUNSLAM, SKINCOLOR_CREAMSICLE, SKINCOLOR_ORANGE, SKINCOLOR_ROSEWOOD, @@ -340,9 +340,9 @@ typedef enum SKINCOLOR_THISTLE, SKINCOLOR_PURPLE, SKINCOLOR_PASTEL, - SKINCOLOR_MOONSLAM, + SKINCOLOR_MOONSET, SKINCOLOR_DUSK, - SKINCOLOR_BUBBLEGUM, + SKINCOLOR_VIOLET, SKINCOLOR_MAGENTA, SKINCOLOR_FUCHSIA, SKINCOLOR_TOXIC, diff --git a/src/g_game.c b/src/g_game.c index d5ed9af7d..7cdb57410 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -6926,7 +6926,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo) (void)extrainfo_p; sprintf(pdemo->winnername, "transrights420"); pdemo->winnerskin = 1; - pdemo->winnercolor = SKINCOLOR_MOONSLAM; + pdemo->winnercolor = SKINCOLOR_MOONSET; pdemo->winnertime = 6666;*/ // Read standings! diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 6126f7bec..3ebf3ee29 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -812,7 +812,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum) case SKINCOLOR_PINK: case SKINCOLOR_ROSE: case SKINCOLOR_LEMONADE: - case SKINCOLOR_BUBBLEGUM: case SKINCOLOR_LILAC: case SKINCOLOR_TAFFY: cstart = "\x8d"; // V_PINKMAP @@ -828,7 +827,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum) cstart = "\x85"; // V_REDMAP break; case SKINCOLOR_DAWN: - case SKINCOLOR_SUNSET: + case SKINCOLOR_SUNSLAM: case SKINCOLOR_CREAMSICLE: case SKINCOLOR_ORANGE: case SKINCOLOR_ROSEWOOD: @@ -906,7 +905,8 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum) break; case SKINCOLOR_MAGENTA: case SKINCOLOR_FUCHSIA: - case SKINCOLOR_MOONSLAM: + case SKINCOLOR_MOONSET: + case SKINCOLOR_VIOLET: cstart = "\x8c"; // V_MAGENTAMAP break; case SKINCOLOR_DUSK: diff --git a/src/k_kart.c b/src/k_kart.c index 230662d2a..335f3cfeb 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -71,7 +71,7 @@ const char *KartColor_Names[MAXSKINCOLORS] = "Scarlet", // SKINCOLOR_SCARLET "Ketchup", // SKINCOLOR_KETCHUP "Dawn", // SKINCOLOR_DAWN - "Sunset", // SKINCOLOR_SUNSET + "Sunslam", // SKINCOLOR_SUNSLAM "Creamsicle", // SKINCOLOR_CREAMSICLE "Orange", // SKINCOLOR_ORANGE "Rosewood", // SKINCOLOR_ROSEWOOD @@ -131,9 +131,9 @@ const char *KartColor_Names[MAXSKINCOLORS] = "Thistle", // SKINCOLOR_THISTLE "Purple", // SKINCOLOR_PURPLE "Pastel", // SKINCOLOR_PASTEL - "Moonslam", // SKINCOLOR_MOONSLAM + "Moonset", // SKINCOLOR_MOONSET "Dusk", // SKINCOLOR_DUSK - "Bubblegum", // SKINCOLOR_BUBBLEGUM + "Violet", // SKINCOLOR_VIOLET "Magenta", // SKINCOLOR_MAGENTA "Fuchsia", // SKINCOLOR_FUCHSIA "Toxic", // SKINCOLOR_TOXIC @@ -177,7 +177,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_ALGAE,10, // SKINCOLOR_SCARLET SKINCOLOR_MUSTARD,10, // SKINCOLOR_KETCHUP SKINCOLOR_DUSK,8, // SKINCOLOR_DAWN - SKINCOLOR_MOONSLAM,8, // SKINCOLOR_SUNSET + SKINCOLOR_MOONSET,8, // SKINCOLOR_SUNSLAM SKINCOLOR_PERIWINKLE,8, // SKINCOLOR_CREAMSICLE SKINCOLOR_BLUE,8, // SKINCOLOR_ORANGE SKINCOLOR_BLUEBERRY,6, // SKINCOLOR_ROSEWOOD @@ -192,7 +192,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_KETCHUP,8, // SKINCOLOR_MUSTARD SKINCOLOR_EMERALD,8, // SKINCOLOR_BANANA SKINCOLOR_TEAL,8, // SKINCOLOR_OLIVE - SKINCOLOR_BUBBLEGUM,8, // SKINCOLOR_CROCODILE + SKINCOLOR_VIOLET,8, // SKINCOLOR_CROCODILE SKINCOLOR_NAVY,6, // SKINCOLOR_PERIDOT SKINCOLOR_ROBOHOOD,8, // SKINCOLOR_VOMIT SKINCOLOR_LAVENDER,6, // SKINCOLOR_GARDEN @@ -237,9 +237,9 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_AZURE,8, // SKINCOLOR_THISTLE SKINCOLOR_CARIBBEAN,10, // SKINCOLOR_PURPLE SKINCOLOR_FUCHSIA,11, // SKINCOLOR_PASTEL - SKINCOLOR_SUNSET,10, // SKINCOLOR_MOONSLAM + SKINCOLOR_SUNSLAM,10, // SKINCOLOR_MOONSET SKINCOLOR_DAWN,6, // SKINCOLOR_DUSK - SKINCOLOR_CROCODILE,8, // SKINCOLOR_BUBBLEGUM + SKINCOLOR_CROCODILE,8, // SKINCOLOR_VIOLET SKINCOLOR_TURTLE,8, // SKINCOLOR_MAGENTA SKINCOLOR_PASTEL,11, // SKINCOLOR_FUCHSIA SKINCOLOR_MAROON,8, // SKINCOLOR_TOXIC @@ -258,7 +258,7 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = { { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31}, // SKINCOLOR_GREY { 3, 5, 8, 11, 15, 17, 19, 21, 23, 24, 25, 26, 27, 29, 30, 31}, // SKINCOLOR_NICKEL { 4, 7, 11, 15, 20, 22, 24, 27, 28, 28, 28, 29, 29, 30, 30, 31}, // SKINCOLOR_BLACK - { 0, 1, 208, 208, 209, 210, 10, 14, 16, 18, 20, 22, 24, 26, 28, 31}, // SKINCOLOR_FAIRY + { 0, 0, 252, 252, 200, 201, 211, 14, 16, 18, 20, 22, 24, 26, 28, 31}, // SKINCOLOR_FAIRY { 0, 80, 80, 81, 82, 218, 240, 11, 13, 16, 18, 21, 23, 26, 28, 31}, // SKINCOLOR_POPCORN { 80, 88, 89, 98, 99, 91, 12, 14, 16, 18, 20, 22, 24, 26, 28, 31}, // SKINCOLOR_ARTICHOKE { 0, 128, 129, 130, 146, 170, 14, 15, 17, 19, 21, 23, 25, 27, 29, 31}, // SKINCOLOR_PIGEON @@ -281,7 +281,7 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = { { 48, 49, 50, 51, 53, 34, 36, 38, 184, 185, 168, 168, 169, 169, 254, 31}, // SKINCOLOR_SCARLET { 72, 73, 64, 51, 52, 54, 34, 36, 38, 40, 42, 43, 44, 71, 46, 47}, // SKINCOLOR_KETCHUP { 0, 208, 216, 209, 210, 211, 212, 57, 58, 59, 60, 61, 63, 71, 47, 31}, // SKINCOLOR_DAWN - { 82, 72, 73, 64, 51, 53, 55, 213, 214, 195, 195, 173, 174, 175, 253, 254}, // SKINCOLOR_SUNSET + { 82, 72, 73, 64, 51, 53, 55, 213, 214, 195, 195, 173, 174, 175, 253, 254}, // SKINCOLOR_SUNSLAM { 0, 0, 208, 208, 48, 49, 50, 52, 53, 54, 56, 57, 58, 60, 61, 63}, // SKINCOLOR_CREAMSICLE {208, 48, 49, 50, 51, 52, 53, 54, 55, 57, 59, 60, 62, 44, 71, 47}, // SKINCOLOR_ORANGE { 50, 52, 55, 56, 58, 59, 60, 61, 62, 63, 44, 45, 71, 46, 47, 30}, // SKINCOLOR_ROSEWOOD @@ -341,9 +341,9 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = { { 0, 0, 0, 252, 252, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 254}, // SKINCOLOR_THISTLE { 0, 252, 160, 161, 162, 163, 164, 165, 166, 167, 168, 168, 169, 169, 253, 254}, // SKINCOLOR_PURPLE { 0, 128, 128, 129, 129, 146, 170, 162, 163, 164, 165, 166, 167, 168, 169, 254}, // SKINCOLOR_PASTEL - { 0, 144, 145, 146, 170, 162, 163, 184, 184, 207, 207, 44, 45, 46, 47, 31}, // SKINCOLOR_MOONSLAM + { 0, 144, 145, 146, 170, 162, 163, 184, 184, 207, 207, 44, 45, 46, 47, 31}, // SKINCOLOR_MOONSET {252, 200, 201, 192, 193, 194, 172, 172, 173, 173, 174, 174, 175, 169, 253, 254}, // SKINCOLOR_DUSK - { 0, 252, 252, 200, 201, 181, 182, 183, 184, 166, 167, 168, 169, 253, 254, 31}, // SKINCOLOR_BUBBLEGUM + {176, 177, 178, 179, 180, 181, 182, 183, 184, 164, 165, 166, 167, 168, 169, 254}, // SKINCOLOR_VIOLET {176, 177, 178, 179, 180, 181, 182, 183, 184, 184, 185, 185, 186, 187, 30, 31}, // SKINCOLOR_MAGENTA {208, 209, 209, 32, 33, 182, 183, 184, 185, 185, 186, 186, 187, 253, 254, 31}, // SKINCOLOR_FUCHSIA { 0, 0, 88, 88, 89, 6, 8, 10, 193, 194, 195, 184, 185, 186, 187, 31}, // SKINCOLOR_TOXIC