From cca779e4a09d1ecdf449f20332c879aa7a32f193 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Wed, 2 Aug 2017 13:11:21 +0100 Subject: [PATCH] * Updated Supercyan constants/names to Supersky, considering the base skincolour Cyan was renamed Sky (and a new Cyan was made independently of that). * Swapped the names of Cloudy and Silver so that Silver meant the shinier option. --- src/dehacked.c | 14 +++++++------- src/doomdef.h | 14 +++++++------- src/r_draw.c | 44 ++++++++++++++++++++++---------------------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 809cdfac0..0d88359ea 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6775,9 +6775,9 @@ static const char *COLOR_ENUMS[] = { // Greyscale ranges "WHITE", // SKINCOLOR_WHITE, "BONE", // SKINCOLOR_BONE, - "SILVER", // SKINCOLOR_SILVER, - "GREY", // SKINCOLOR_GREY, "CLOUDY", // SKINCOLOR_CLOUDY, + "GREY", // SKINCOLOR_GREY, + "SILVER", // SKINCOLOR_SILVER, "CARBON", // SKINCOLOR_CARBON, "JET", // SKINCOLOR_JET, "BLACK", // SKINCOLOR_BLACK, @@ -6871,11 +6871,11 @@ static const char *COLOR_ENUMS[] = { "SUPERPERIDOT4", // SKINCOLOR_SUPERPERIDOT4, "SUPERPERIDOT5", // SKINCOLOR_SUPERPERIDOT5, - "SUPERCYAN1", // SKINCOLOR_SUPERCYAN1 - "SUPERCYAN2", // SKINCOLOR_SUPERCYAN2, - "SUPERCYAN3", // SKINCOLOR_SUPERCYAN3, - "SUPERCYAN4", // SKINCOLOR_SUPERCYAN4, - "SUPERCYAN5", // SKINCOLOR_SUPERCYAN5, + "SUPERSKY1", // SKINCOLOR_SUPERSKY1 + "SUPERSKY2", // SKINCOLOR_SUPERSKY2, + "SUPERSKY3", // SKINCOLOR_SUPERSKY3, + "SUPERSKY4", // SKINCOLOR_SUPERSKY4, + "SUPERSKY5", // SKINCOLOR_SUPERSKY5, "SUPERPURPLE1", // SKINCOLOR_SUPERPURPLE1, "SUPERPURPLE2", // SKINCOLOR_SUPERPURPLE2, diff --git a/src/doomdef.h b/src/doomdef.h index 1d8f99a7a..ec01d50c9 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -233,9 +233,9 @@ typedef enum // Greyscale ranges SKINCOLOR_WHITE, SKINCOLOR_BONE, - SKINCOLOR_SILVER, - SKINCOLOR_GREY, SKINCOLOR_CLOUDY, + SKINCOLOR_GREY, + SKINCOLOR_SILVER, SKINCOLOR_CARBON, SKINCOLOR_JET, SKINCOLOR_BLACK, @@ -333,11 +333,11 @@ typedef enum SKINCOLOR_SUPERPERIDOT4, SKINCOLOR_SUPERPERIDOT5, - SKINCOLOR_SUPERCYAN1, - SKINCOLOR_SUPERCYAN2, - SKINCOLOR_SUPERCYAN3, - SKINCOLOR_SUPERCYAN4, - SKINCOLOR_SUPERCYAN5, + SKINCOLOR_SUPERSKY1, + SKINCOLOR_SUPERSKY2, + SKINCOLOR_SUPERSKY3, + SKINCOLOR_SUPERSKY4, + SKINCOLOR_SUPERSKY5, SKINCOLOR_SUPERPURPLE1, SKINCOLOR_SUPERPURPLE2, diff --git a/src/r_draw.c b/src/r_draw.c index 471fa1ed0..dadc494dc 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -137,9 +137,9 @@ const UINT8 Color_Index[MAXTRANSLATIONS-1][16] = { // Greyscale ranges {0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11}, // SKINCOLOR_WHITE {0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x05, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11, 0x12}, // SKINCOLOR_BONE - {0x02, 0x03, 0x04, 0x05, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14}, // SKINCOLOR_SILVER + {0x02, 0x03, 0x04, 0x05, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14}, // SKINCOLOR_CLOUDY {0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}, // SKINCOLOR_GREY - {0x02, 0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1b, 0x1d, 0x1f}, // SKINCOLOR_CLOUDY + {0x02, 0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1b, 0x1d, 0x1f}, // SKINCOLOR_SILVER {0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x16, 0x17, 0x17, 0x19, 0x19, 0x1a, 0x1a, 0x1b, 0x1c, 0x1d}, // SKINCOLOR_CARBON {0x00, 0x05, 0x0a, 0x0f, 0x14, 0x19, 0x1a, 0x1b, 0x1c, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x1f, 0x1f}, // SKINCOLOR_JET {0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1b, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f}, // SKINCOLOR_BLACK @@ -235,11 +235,11 @@ const UINT8 Color_Index[MAXTRANSLATIONS-1][16] = { {0x58, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f}, // SKINCOLOR_SUPERPERIDOT4 {0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f, 0x77}, // SKINCOLOR_SUPERPERIDOT5 - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x81, 0x82, 0x83, 0x84}, // SKINCOLOR_SUPERCYAN1 - {0x00, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86}, // SKINCOLOR_SUPERCYAN2 - {0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87}, // SKINCOLOR_SUPERCYAN3 - {0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a}, // SKINCOLOR_SUPERCYAN4 - {0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a, 0x8b}, // SKINCOLOR_SUPERCYAN5 + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x81, 0x82, 0x83, 0x84}, // SKINCOLOR_SUPERSKY1 + {0x00, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86}, // SKINCOLOR_SUPERSKY2 + {0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87}, // SKINCOLOR_SUPERSKY3 + {0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a}, // SKINCOLOR_SUPERSKY4 + {0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a, 0x8b}, // SKINCOLOR_SUPERSKY5 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90, 0xa0, 0xa0, 0xa1, 0xa2}, // SKINCOLOR_SUPERPURPLE1 {0x00, 0x90, 0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5}, // SKINCOLOR_SUPERPURPLE2 @@ -269,9 +269,9 @@ const char *Color_Names[MAXSKINCOLORS + NUMSUPERCOLORS] = // Greyscale ranges "White", // SKINCOLOR_WHITE, "Bone", // SKINCOLOR_BONE, - "Silver", // SKINCOLOR_SILVER, - "Grey", // SKINCOLOR_GREY, "Cloudy", // SKINCOLOR_CLOUDY, + "Grey", // SKINCOLOR_GREY, + "Silver", // SKINCOLOR_SILVER, "Carbon", // SKINCOLOR_CARBON, "Jet", // SKINCOLOR_JET, "Black", // SKINCOLOR_BLACK, @@ -335,15 +335,15 @@ const char *Color_Names[MAXSKINCOLORS + NUMSUPERCOLORS] = "Rosy", // SKINCOLOR_ROSY, // Super behaves by different rules (one name per 5 colours), and will be accessed exclusively via R_GetSuperColorByName instead of R_GetColorByName. - "Silver", // SKINCOLOR_SUPERSILVER1 - "Red", // SKINCOLOR_SUPERRED1 - "Orange", // SKINCOLOR_SUPERORANGE1 - "Gold", // SKINCOLOR_SUPERGOLD1 - "Peridot", // SKINCOLOR_SUPERPERIDOT1 - "Cyan", // SKINCOLOR_SUPERCYAN1 - "Purple", // SKINCOLOR_SUPERPURPLE1 - "Rust", // SKINCOLOR_SUPERRUST1 - "Tan" // SKINCOLOR_SUPERTAN1 + "Silver", // SKINCOLOR_SUPERSILVER1, + "Red", // SKINCOLOR_SUPERRED1, + "Orange", // SKINCOLOR_SUPERORANGE1, + "Gold", // SKINCOLOR_SUPERGOLD1, + "Peridot", // SKINCOLOR_SUPERPERIDOT1, + "Sky", // SKINCOLOR_SUPERSKY1, + "Purple", // SKINCOLOR_SUPERPURPLE1, + "Rust", // SKINCOLOR_SUPERRUST1, + "Tan" // SKINCOLOR_SUPERTAN1, }; /* @@ -357,16 +357,16 @@ const UINT8 Color_Opposite[(MAXSKINCOLORS - 1)*2] = // Greyscale ranges SKINCOLOR_BLACK,5, // SKINCOLOR_WHITE, SKINCOLOR_JET,7, // SKINCOLOR_BONE, - SKINCOLOR_CARBON,7, // SKINCOLOR_SILVER, + SKINCOLOR_CARBON,7, // SKINCOLOR_CLOUDY, SKINCOLOR_AETHER,12, // SKINCOLOR_GREY, - SKINCOLOR_SLATE,12, // SKINCOLOR_CLOUDY, - SKINCOLOR_SILVER,7, // SKINCOLOR_CARBON, + SKINCOLOR_SLATE,12, // SKINCOLOR_SILVER, + SKINCOLOR_CLOUDY,7, // SKINCOLOR_CARBON, SKINCOLOR_BONE,7, // SKINCOLOR_JET, SKINCOLOR_WHITE,7, // SKINCOLOR_BLACK, // Desaturated SKINCOLOR_GREY,15, // SKINCOLOR_AETHER, - SKINCOLOR_CLOUDY,12, // SKINCOLOR_SLATE, + SKINCOLOR_SILVER,12, // SKINCOLOR_SLATE, SKINCOLOR_AZURE,9, // SKINCOLOR_PINK, SKINCOLOR_RUST,7, // SKINCOLOR_YOGURT, SKINCOLOR_TAN,2, // SKINCOLOR_BROWN,