From 407344299ce132f7b1c4189390b791996bf9765d Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Tue, 14 May 2019 21:00:40 -0400 Subject: [PATCH] Rename colors My attempt at compromise didn't work, so I'll just have it my way --- src/dehacked.c | 4 ++-- src/doomdef.h | 4 ++-- src/hu_stuff.c | 4 ++-- src/k_kart.c | 18 +++++++++--------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index f138ca688..7e81a529f 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -8166,7 +8166,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart. "LEATHER", // SKINCOLOR_LEATHER "SALMON", // SKINCOLOR_SALMON "PINK", // SKINCOLOR_PINK - "ORCHID", // SKINCOLOR_ORCHID + "ROSE", // SKINCOLOR_ROSE "CINNAMON", // SKINCOLOR_CINNAMON "RUBY", // SKINCOLOR_RUBY "RASPBERRY", // SKINCOLOR_RASPBERRY @@ -8248,7 +8248,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart. "BYZANTIUM", // SKINCOLOR_BYZANTIUM "POMEGRANATE", // SKINCOLOR_POMEGRANATE "LILAC", // SKINCOLOR_LILAC - "ROSE", // SKINCOLOR_ROSE + "TAFFY", // SKINCOLOR_TAFFY // Special super colors // Super Sonic Yellow diff --git a/src/doomdef.h b/src/doomdef.h index f26f462f0..4d3934773 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -269,7 +269,7 @@ typedef enum SKINCOLOR_LEATHER, SKINCOLOR_SALMON, SKINCOLOR_PINK, - SKINCOLOR_ORCHID, + SKINCOLOR_ROSE, SKINCOLOR_CINNAMON, SKINCOLOR_RUBY, SKINCOLOR_RASPBERRY, @@ -351,7 +351,7 @@ typedef enum SKINCOLOR_BYZANTIUM, SKINCOLOR_POMEGRANATE, SKINCOLOR_LILAC, - SKINCOLOR_ROSE, + SKINCOLOR_TAFFY, // "Careful! MAXSKINCOLORS cannot be greater than 0x40 -- Which it is now." // (This comment is a dirty liar! This is only limited by the integer type, so 255 for UINT8.) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 9a9becd77..7a912e010 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -810,11 +810,11 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum) case SKINCOLOR_FAIRY: case SKINCOLOR_SALMON: case SKINCOLOR_PINK: - case SKINCOLOR_ORCHID: + case SKINCOLOR_ROSE: case SKINCOLOR_LEMONADE: case SKINCOLOR_BUBBLEGUM: case SKINCOLOR_LILAC: - case SKINCOLOR_ROSE: + case SKINCOLOR_TAFFY: cstart = "\x8d"; // V_PINKMAP break; case SKINCOLOR_CINNAMON: diff --git a/src/k_kart.c b/src/k_kart.c index 2301c51b8..659c499db 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -61,7 +61,7 @@ const char *KartColor_Names[MAXSKINCOLORS] = "Leather", // SKINCOLOR_LEATHER "Salmon", // SKINCOLOR_SALMON "Pink", // SKINCOLOR_PINK - "Orchid", // SKINCOLOR_ORCHID + "Rose", // SKINCOLOR_ROSE "Cinnamon", // SKINCOLOR_CINNAMON "Ruby", // SKINCOLOR_RUBY "Raspberry", // SKINCOLOR_RASPBERRY @@ -143,7 +143,7 @@ const char *KartColor_Names[MAXSKINCOLORS] = "Byzantium", // SKINCOLOR_BYZANTIUM "Pomegranate", // SKINCOLOR_POMEGRANATE "Lilac", // SKINCOLOR_LILAC - "Rose" // SKINCOLOR_ROSE + "Taffy" // SKINCOLOR_TAFFY }; // Color_Opposite replacement; frame setting has not been changed from 8 for most, should be done later @@ -167,7 +167,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_SEPIA,8, // SKINCOLOR_LEATHER SKINCOLOR_TEA,8, // SKINCOLOR_SALMON SKINCOLOR_PISTACHIO,8, // SKINCOLOR_PINK - SKINCOLOR_MOSS,8, // SKINCOLOR_ORCHID + SKINCOLOR_MOSS,8, // SKINCOLOR_ROSE SKINCOLOR_WRISTWATCH,6, // SKINCOLOR_CINNAMON SKINCOLOR_SAPPHIRE,8, // SKINCOLOR_RUBY SKINCOLOR_MINT,8, // SKINCOLOR_RASPBERRY @@ -201,7 +201,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_ULTRAMARINE,8, // SKINCOLOR_HANDHELD SKINCOLOR_SALMON,8, // SKINCOLOR_TEA SKINCOLOR_PINK,6, // SKINCOLOR_PISTACHIO - SKINCOLOR_ORCHID,8, // SKINCOLOR_MOSS + SKINCOLOR_ROSE,8, // SKINCOLOR_MOSS SKINCOLOR_CAMOUFLAGE,8, // SKINCOLOR_CAMOUFLAGE SKINCOLOR_VOMIT,8, // SKINCOLOR_ROBOHOOD SKINCOLOR_RASPBERRY,8, // SKINCOLOR_MINT @@ -229,7 +229,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_PLAGUE,10, // SKINCOLOR_NOVA SKINCOLOR_TAN,8, // SKINCOLOR_RUST SKINCOLOR_CINNAMON,8, // SKINCOLOR_WRISTWATCH - SKINCOLOR_ROSE,8, // SKINCOLOR_JET + SKINCOLOR_TAFFY,8, // SKINCOLOR_JET SKINCOLOR_RUBY,6, // SKINCOLOR_SAPPHIRE SKINCOLOR_HANDHELD,10, // SKINCOLOR_ULTRAMARINE SKINCOLOR_CREAMSICLE,8, // SKINCOLOR_PERIWINKLE @@ -249,7 +249,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_SWAMP,8, // SKINCOLOR_BYZANTIUM SKINCOLOR_DREAM,8, // SKINCOLOR_POMEGRANATE SKINCOLOR_JAWZ,6, // SKINCOLOR_LILAC - SKINCOLOR_JET,8 // SKINCOLOR_ROSE + SKINCOLOR_JET,8 // SKINCOLOR_TAFFY }; UINT8 colortranslations[MAXTRANSLATIONS][16] = { @@ -271,7 +271,7 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = { {218, 221, 224, 227, 229, 231, 233, 235, 237, 239, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_LEATHER { 0, 0, 0, 208, 208, 209, 210, 32, 34, 35, 36, 38, 40, 42, 44, 46}, // SKINCOLOR_SALMON { 0, 208, 208, 209, 209, 210, 211, 211, 212, 213, 214, 215, 41, 43, 45, 46}, // SKINCOLOR_PINK - {209, 210, 211, 211, 212, 213, 214, 215, 41, 42, 43, 44, 45, 71, 46, 47}, // SKINCOLOR_ORCHID + {209, 210, 211, 211, 212, 213, 214, 215, 41, 42, 43, 44, 45, 71, 46, 47}, // SKINCOLOR_ROSE {216, 221, 224, 226, 228, 60, 61, 43, 44, 45, 71, 46, 47, 29, 30, 31}, // SKINCOLOR_CINNAMON { 0, 208, 209, 210, 211, 213, 39, 40, 41, 43, 186, 186, 169, 169, 253, 254}, // SKINCOLOR_RUBY { 0, 208, 209, 210, 32, 33, 34, 35, 37, 39, 41, 43, 44, 45, 46, 47}, // SKINCOLOR_RASPBERRY @@ -353,7 +353,7 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = { {145, 192, 193, 194, 195, 196, 197, 198, 199, 199, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BYZANTIUM {208, 209, 210, 211, 212, 213, 214, 195, 195, 196, 196, 197, 198, 199, 29, 30}, // SKINCOLOR_POMEGRANATE { 0, 0, 0, 252, 252, 176, 200, 201, 179, 192, 193, 194, 195, 196, 197, 198}, // SKINCOLOR_LILAC - { 0, 252, 252, 200, 200, 201, 202, 203, 204, 204, 205, 206, 207, 43, 45, 47}, // SKINCOLOR_ROSE + { 0, 252, 252, 200, 200, 201, 202, 203, 204, 204, 205, 206, 207, 43, 45, 47}, // SKINCOLOR_TAFFY // THESE STILL NEED CONVERTED!!! { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, 100, 104, 113, 116, 119}, // SKINCOLOR_SUPER1 @@ -6832,7 +6832,7 @@ static void K_drawKartItem(void) break; case 11: // Eggman Monitor localpatch = kp_eggman[offset]; - //localcolor = SKINCOLOR_ORCHID; + //localcolor = SKINCOLOR_ROSE; break; case 12: // Ballhog localpatch = kp_ballhog[offset];