From e76c32812905c3ed600068367cb7ef2708998741 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 2 Jul 2018 13:20:04 +0100 Subject: [PATCH] Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists... More menu/highlight things: * Rename "Default" to "Game type", to make clearer what it's doing. * Tweak race colouring slightly. * Put a highlight around the level select icon, and make it consistent with voting. * Allow setting the highlight colour to affect the intermissions. * Fix bug with gametype colour getting for record attack. A handful of skincolour things: * Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name. * Fix incomplete Steel Blue -> Steel rename. * Merge the very similar Blueberry and Sapphire... * ... so Sapphire can be backported! * And Ruby too. --- src/console.c | 14 +++--- src/console.h | 2 +- src/dehacked.c | 2 +- src/doomdef.h | 4 +- src/g_game.c | 3 +- src/hardware/hw_md2.c | 2 +- src/k_kart.c | 49 ++++++++++---------- src/m_menu.c | 41 ++++++++++------- src/r_draw.c | 8 ++-- src/st_stuff.c | 6 +-- src/v_video.c | 2 +- src/y_inter.c | 101 +++++++++++++----------------------------- 12 files changed, 105 insertions(+), 129 deletions(-) diff --git a/src/console.c b/src/console.c index bda12f8a..7faf954d 100644 --- a/src/console.c +++ b/src/console.c @@ -141,7 +141,7 @@ consvar_t cons_backcolor = {"con_backcolor", "Green", CV_CALL|CV_SAVE, backcolor static CV_PossibleValue_t menuhighlight_cons_t[] = { - {0, "Default"}, + {0, "Game type"}, {V_YELLOWMAP, "Always yellow"}, {V_PURPLEMAP, "Always purple"}, {V_GREENMAP, "Always green"}, @@ -152,7 +152,7 @@ static CV_PossibleValue_t menuhighlight_cons_t[] = {V_SKYMAP, "Always sky-blue"}, {0, NULL} }; -consvar_t cons_menuhighlight = {"menuhighlight", "Default", CV_SAVE, menuhighlight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cons_menuhighlight = {"menuhighlight", "Game type", CV_SAVE, menuhighlight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static void CON_Print(char *msg); @@ -242,7 +242,7 @@ static void CONS_Bind_f(void) // Font colormap colors // TODO: This could probably be improved somehow... // These colormaps are 99% identical, with just a few changed bytes -UINT8 *yellowmap, *purplemap, *lgreenmap, *bluemap, *graymap, *redmap, *orangemap, *skymap; +UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap, *skymap; // Console BG color UINT8 *consolebgmap = NULL; @@ -291,8 +291,8 @@ static void CON_SetupColormaps(void) purplemap = memorysrc; yellowmap = (purplemap+256); - lgreenmap = (yellowmap+256); - bluemap = (lgreenmap+256); + greenmap = (yellowmap+256); + bluemap = (greenmap+256); redmap = (bluemap+256); graymap = (redmap+256); orangemap = (graymap+256); @@ -309,12 +309,12 @@ static void CON_SetupColormaps(void) // SRB2Kart: Different console font, new colors purplemap[120] = (UINT8)194; yellowmap[120] = (UINT8)103; - lgreenmap[120] = (UINT8)162; + greenmap[120] = (UINT8)162; bluemap[120] = (UINT8)228; graymap[120] = (UINT8)10; redmap[120] = (UINT8)126; // battle orangemap[120] = (UINT8)85; // record attack - skymap[120] = (UINT8)215; // race + skymap[120] = (UINT8)214; // race // Init back colormap CON_SetupBackColormap(); diff --git a/src/console.h b/src/console.h index f5b69619..896214c9 100644 --- a/src/console.h +++ b/src/console.h @@ -38,7 +38,7 @@ extern UINT32 con_scalefactor; // console text scale factor extern consvar_t cons_backcolor, cons_menuhighlight; -extern UINT8 *yellowmap, *purplemap, *lgreenmap, *bluemap, *graymap, *redmap, *orangemap, *skymap; +extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap, *skymap; // Console bg color (auto updated to match) extern UINT8 *consolebgmap; diff --git a/src/dehacked.c b/src/dehacked.c index 6afa4894..2684dff2 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -7496,7 +7496,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart. "PERIWINKLE", // 47 // SKINCOLOR_PERIWINKLE "CYAN", // 48 // SKINCOLOR_CYAN "CERULEAN", // 49 // SKINCOLOR_CERULEAN - "TURQUOISE", // 50 // SKINCOLOR_TURQUOISE + "AQUA", // 50 // SKINCOLOR_AQUA "TEAL", // 51 // SKINCOLOR_TEAL "STEEL", // 52 // SKINCOLOR_STEEL "BLUE", // 53 // SKINCOLOR_BLUE diff --git a/src/doomdef.h b/src/doomdef.h index e10c5d45..3d6ee2f4 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -281,11 +281,11 @@ typedef enum SKINCOLOR_PERIWINKLE, SKINCOLOR_CYAN, SKINCOLOR_CERULEAN, - SKINCOLOR_TURQUOISE, + SKINCOLOR_AQUA, SKINCOLOR_TEAL, SKINCOLOR_STEEL, SKINCOLOR_BLUE, - SKINCOLOR_SAPPHIRE, + SKINCOLOR_SAPPHIRE, // sweet mother, i cannot weave – slender aphrodite has overcome me with longing for a girl SKINCOLOR_NAVY, SKINCOLOR_BLUEBERRY, SKINCOLOR_JET, diff --git a/src/g_game.c b/src/g_game.c index 17f6033c..429e052e 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3065,7 +3065,8 @@ INT16 G_SometimesGetDifferentGametype(void) // UINT8 G_GetGametypeColor(INT16 gt) { - if (modeattacking) // == ATTACKING_RECORD) + if (modeattacking // == ATTACKING_RECORD + || gamestate == GS_TIMEATTACK) return orangemap[120]; if (gt == GT_MATCH) return redmap[120]; diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 7811983e..02ad128c 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1112,7 +1112,7 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, case SKINCOLOR_CERULEAN: blendcolor = V_GetColor(217); break; - case SKINCOLOR_TURQUOISE: + case SKINCOLOR_AQUA: blendcolor = V_GetColor(215); break; case SKINCOLOR_TEAL: diff --git a/src/k_kart.c b/src/k_kart.c index 300184af..81eebb2b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -66,10 +66,10 @@ const char *KartColor_Names[MAXSKINCOLORS] = "Beige", // 23 // SKINCOLOR_BEIGE "Brown", // 24 // SKINCOLOR_BROWN "Leather", // 25 // SKINCOLOR_LEATHER - "Tangerine", // 26 // SKINCOLOR_YELLOW - "Yellow", // 26 // SKINCOLOR_YELLOW - "Peach", // 27 // SKINCOLOR_PEACH - "Creamsicle", // 28 // SKINCOLOR_CREAMSICLE + "Tangerine", // 26 // SKINCOLOR_TANGERINE + "Yellow", // 27 // SKINCOLOR_YELLOW + "Peach", // 28 // SKINCOLOR_PEACH + "Creamsicle", // 29 // SKINCOLOR_CREAMSICLE "Gold", // 30 // SKINCOLOR_GOLD "Caramel", // 31 // SKINCOLOR_CARAMEL "Vomit", // 32 // SKINCOLOR_VOMIT @@ -86,19 +86,19 @@ const char *KartColor_Names[MAXSKINCOLORS] = "Green", // 43 // SKINCOLOR_GREEN "Pinetree", // 44 // SKINCOLOR_PINETREE "Swamp", // 45 // SKINCOLOR_SWAMP - "Slate", // 47 // SKINCOLOR_SLATE - "Periwinkle", // 48 // SKINCOLOR_PERIWINKLE - "Cyan", // 49 // SKINCOLOR_CYAN - "Cerulean", // 50 // SKINCOLOR_CERULEAN - "Turquoise", // 46 // SKINCOLOR_TURQUOISE - "Teal", // 52 // SKINCOLOR_TEAL - "Steel Blue", // 53 // SKINCOLOR_STEELBLUE - "Blue", // 54 // SKINCOLOR_BLUE - "Sapphire", // 55 // SKINCOLOR_SAPPHIRE - "Navy", // 56 // SKINCOLOR_NAVY - "Blueberry", // 57 // SKINCOLOR_BLUEBERRY - "Jet", // 58 // SKINCOLOR_JET - "Lilac", // 59 // SKINCOLOR_LILAC + "Slate", // 46 // SKINCOLOR_SLATE + "Periwinkle", // 47 // SKINCOLOR_PERIWINKLE + "Cyan", // 48 // SKINCOLOR_CYAN + "Cerulean", // 49 // SKINCOLOR_CERULEAN + "Aqua", // 50 // SKINCOLOR_AQUA + "Teal", // 51 // SKINCOLOR_TEAL + "Steel", // 52 // SKINCOLOR_STEEL + "Blue", // 53 // SKINCOLOR_BLUE + "Sapphire", // 54 // SKINCOLOR_SAPPHIRE + "Navy", // 55 // SKINCOLOR_NAVY + "Blueberry", // 56 // SKINCOLOR_BLUEBERRY + "Jet", // 57 // SKINCOLOR_JET + "Lilac", // 58 // SKINCOLOR_LILAC "Dusk", // 59 // SKINCOLOR_DUSK "Purple", // 60 // SKINCOLOR_PURPLE "Lavender", // 61 // SKINCOLOR_LAVENDER @@ -159,7 +159,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_CREAMSICLE,8, // 47 // SKINCOLOR_PERIWINKLE SKINCOLOR_CARAMEL,8, // 48 // SKINCOLOR_CYAN SKINCOLOR_GOLD,8, // 49 // SKINCOLOR_CERULEAN - SKINCOLOR_CRIMSON,8, // 50 // SKINCOLOR_TURQUOISE + SKINCOLOR_CRIMSON,8, // 50 // SKINCOLOR_AQUA SKINCOLOR_RED,8, // 51 // SKINCOLOR_TEAL SKINCOLOR_PEACH,8, // 52 // SKINCOLOR_STEEL SKINCOLOR_ORANGE,8, // 53 // SKINCOLOR_BLUE @@ -187,7 +187,7 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = { {120, 120, 120, 121, 121, 122, 122, 123, 124, 125, 126, 128, 129, 131, 133, 135}, // SKINCOLOR_SALMON {121, 121, 121, 121, 121, 122, 144, 145, 146, 147, 148, 149, 150, 150, 150, 151}, // SKINCOLOR_PINK {120, 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 133, 134, 136, 137, 139}, // SKINCOLOR_RASPBERRY - {120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143}, // SKINCOLOR_RUBY + {120, 0, 144, 146, 149, 131, 132, 133, 134, 135, 197, 197, 198, 198, 199, 241}, // SKINCOLOR_RUBY {125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140}, // SKINCOLOR_RED {144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141}, // SKINCOLOR_ROSE {130, 131, 132, 133, 134, 136, 137, 138, 139, 139, 140, 140, 141, 141, 142, 143}, // SKINCOLOR_CRIMSON @@ -226,13 +226,13 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = { {120, 224, 225, 226, 226, 227, 228, 228, 229, 230, 231, 234, 235, 237, 239, 241}, // SKINCOLOR_PERIWINKLE {120, 208, 209, 210, 211, 212, 213, 215, 216, 216, 216, 217, 217, 218, 218, 219}, // SKINCOLOR_CYAN {208, 209, 211, 213, 215, 216, 216, 217, 217, 218, 218, 219, 205, 206, 207, 207}, // SKINCOLOR_CERULEAN - {120, 208, 208, 210, 212, 214, 220, 220, 220, 221, 221, 222, 222, 223, 223, 191}, // SKINCOLOR_TURQUOISE + {120, 208, 208, 210, 212, 214, 220, 220, 220, 221, 221, 222, 222, 223, 223, 191}, // SKINCOLOR_AQUA {210, 213, 220, 220, 220, 221, 221, 221, 221, 222, 222, 222, 223, 223, 191, 31}, // SKINCOLOR_TEAL {120, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 207, 31}, // SKINCOLOR_STEEL {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239}, // SKINCOLOR_BLUE - {224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246}, // SKINCOLOR_SAPPHIRE + {208, 210, 212, 214, 216, 229, 231, 232, 233, 235, 236, 237, 238, 239, 241, 244}, // SKINCOLOR_SAPPHIRE {200, 201, 202, 203, 204, 205, 206, 238, 239, 240, 241, 242, 243, 244, 245, 246}, // SKINCOLOR_NAVY - {228, 229, 230, 231, 232, 233, 234, 235, 237, 238, 239, 240, 242, 243, 244, 246}, // SKINCOLOR_BLUEBERRY + {225, 226, 227, 228, 229, 230, 232, 234, 236, 238, 239, 240, 242, 243, 244, 246}, // SKINCOLOR_BLUEBERRY {200, 201, 202, 203, 204, 205, 206, 207, 28, 28, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_JET {120, 120, 120, 121, 121, 122, 122, 123, 192, 248, 249, 250, 251, 252, 253, 254}, // SKINCOLOR_LILAC {192, 192, 248, 249, 250, 251, 204, 204, 205, 205, 206, 206, 207, 29, 30, 31}, // SKINCOLOR_DUSK @@ -241,7 +241,10 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = { {192, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BYZANTIUM {192, 193, 194, 195, 196, 197, 198, 199, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_INDIGO /* Removed Colours - {224, 225, 226, 212, 213, 213, 214, 215, 220, 221, 172, 222, 173, 223, 174, 175}, // SKINCOLOR_FROST, merged into Turquoise + {120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143}, // SKINCOLOR_RUBY, replaced by 2.2 backport + {224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246}, // SKINCOLOR_SAPPHIRE, merged into blueberry + {228, 229, 230, 231, 232, 233, 234, 235, 237, 238, 239, 240, 242, 243, 244, 246}, // SKINCOLOR_BLUEBERRY, before merger + {224, 225, 226, 212, 213, 213, 214, 215, 220, 221, 172, 222, 173, 223, 174, 175}, // SKINCOLOR_FROST, merged into AQUA { 72, 73, 74, 75, 76, 77, 78, 79, 48, 49, 50, 51, 52, 53, 54, 55}, // SKINCOLOR_CARAMEL, new Caramel was previously Shiny Caramel { 1, 145, 125, 73, 83, 114, 106, 180, 187, 168, 219, 205, 236, 206, 199, 255}, // SKINCOLOR_RAINBOW, is Vomit 2.0 */ diff --git a/src/m_menu.c b/src/m_menu.c index c182ace0..e5de6d48 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -960,13 +960,13 @@ static menuitem_t MP_SplitServerMenu[] = #endif {IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 78}, #ifdef NOFOURPLAYER - {IT_STRING|IT_CALL, NULL, "P1 Setup...", M_SetupMultiPlayer, 110}, - {IT_STRING|IT_CALL, NULL, "P2 Setup... ", M_SetupMultiPlayer2, 120}, + {IT_STRING|IT_CALL, NULL, "P1 Setup...", M_SetupMultiPlayer, 108}, + {IT_STRING|IT_CALL, NULL, "P2 Setup... ", M_SetupMultiPlayer2, 118}, #else - {IT_STRING|IT_CALL, NULL, "P1 Setup...", M_SetupMultiPlayer, 90}, - {IT_STRING|IT_CALL, NULL, "P2 Setup... ", M_SetupMultiPlayer2, 100}, - {IT_GRAYEDOUT, NULL, "P3 Setup...", M_SetupMultiPlayer3, 110}, - {IT_GRAYEDOUT, NULL, "P4 Setup... ", M_SetupMultiPlayer4, 120}, + {IT_STRING|IT_CALL, NULL, "P1 Setup...", M_SetupMultiPlayer, 88}, + {IT_STRING|IT_CALL, NULL, "P2 Setup... ", M_SetupMultiPlayer2, 98}, + {IT_GRAYEDOUT, NULL, "P3 Setup...", M_SetupMultiPlayer3, 108}, + {IT_GRAYEDOUT, NULL, "P4 Setup... ", M_SetupMultiPlayer4, 118}, #endif {IT_WHITESTRING|IT_CALL, NULL, "Start", M_StartServer, 130}, }; @@ -976,12 +976,13 @@ static void Dummysplitplayers_OnChange(void) { UINT8 i = 2; // player 2 is the last unchanging setup - while (i++ < 4) + while (i < 4) { - if (i <= cv_dummysplitplayers.value) - MP_SplitServerMenu[3+i-1].status = IT_STRING|IT_CALL; + if (i < cv_dummysplitplayers.value) + MP_SplitServerMenu[3+i].status = IT_STRING|IT_CALL; else - MP_SplitServerMenu[3+i-1].status = IT_GRAYEDOUT; + MP_SplitServerMenu[3+i].status = IT_GRAYEDOUT; + i++; } } #endif @@ -6704,7 +6705,7 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade) { lumpnum_t lumpnum; patch_t *PictureOfLevel; - INT32 x, y, w, i, oldval, trans = 0, dupadjust = ((vid.width/vid.dupx) - BASEVIDWIDTH)>>1; + INT32 x, y, w, i, oldval, trans, dupadjust = ((vid.width/vid.dupx) - BASEVIDWIDTH)>>1; // A 160x100 image of the level as entry MAPxxP lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(cv_nextmap.value))); @@ -6714,15 +6715,23 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade) else PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE); - w = (SHORT(PictureOfLevel->width)/4); - x = BASEVIDWIDTH/2 - w; - y = currentMenu->y + 130 + 8 - (SHORT(PictureOfLevel->height)/2); + w = SHORT(PictureOfLevel->width)/2; + i = SHORT(PictureOfLevel->height)/2; + x = BASEVIDWIDTH/2 - w/2; + y = currentMenu->y + 130 + 8 - i; + + if (currentMenu->menuitems[itemOn].itemaction == &cv_nextmap && skullAnimCounter < 4) + trans = 120; + else + trans = G_GetGametypeColor(cv_newgametype.value); + + V_DrawFill(x-1, y-1, w+2, i+2, trans); // variable reuse... V_DrawSmallScaledPatch(x, y, 0, PictureOfLevel); /*V_DrawDiag(x, y, 12, 31); V_DrawDiag(x, y, 10, G_GetGametypeColor(cv_newgametype.value));*/ - y += SHORT(PictureOfLevel->height)/8; + y += i/4; i = cv_nextmap.value - 1; trans = (leftfade ? V_TRANSLUCENT : 0); @@ -6756,7 +6765,7 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade) V_DrawTinyScaledPatch(x, y, trans, PictureOfLevel); } while (x > horizspac-dupadjust); - x = BASEVIDWIDTH/2 + w + horizspac; + x = (BASEVIDWIDTH + w)/2 + horizspac; i = cv_nextmap.value - 1; trans = (rightfade ? V_TRANSLUCENT : 0); diff --git a/src/r_draw.c b/src/r_draw.c index 2e651ae3..60927434 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -155,7 +155,7 @@ const char *Color_Names[MAXSKINCOLORS] = "Black", // SKINCOLOR_BLACK "Cyan", // SKINCOLOR_CYAN "Teal", // SKINCOLOR_TEAL - "Steel_Blue",// SKINCOLOR_STEELBLUE + "Steel_Blue",// SKINCOLOR_STEEL "Blue", // SKINCOLOR_BLUE "Peach", // SKINCOLOR_PEACH "Tan", // SKINCOLOR_TAN @@ -185,7 +185,7 @@ const UINT8 Color_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_WHITE,8, // SKINCOLOR_BLACK SKINCOLOR_NONE,8, // SKINCOLOR_CYAN SKINCOLOR_NONE,8, // SKINCOLOR_TEAL - SKINCOLOR_NONE,8, // SKINCOLOR_STEELBLUE + SKINCOLOR_NONE,8, // SKINCOLOR_STEEL SKINCOLOR_ORANGE,9, // SKINCOLOR_BLUE SKINCOLOR_NONE,8, // SKINCOLOR_PEACH SKINCOLOR_NONE,8, // SKINCOLOR_TAN @@ -257,7 +257,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U 0x18, // SKINCOLOR_BLACK 0xd0, // SKINCOLOR_CYAN 0xdc, // SKINCOLOR_TEAL - 0xc8, // SKINCOLOR_STEELBLUE + 0xc8, // SKINCOLOR_STEEL 0xe2, // SKINCOLOR_BLUE 0x40, // SKINCOLOR_PEACH 0x48, // SKINCOLOR_TAN @@ -339,7 +339,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U case SKINCOLOR_WHITE: case SKINCOLOR_BLACK: - case SKINCOLOR_STEELBLUE: + case SKINCOLOR_STEEL: case SKINCOLOR_PINK: case SKINCOLOR_LAVENDER: case SKINCOLOR_PURPLE: diff --git a/src/st_stuff.c b/src/st_stuff.c index 3df0bc0d..331e7b32 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -930,7 +930,7 @@ static void ST_drawFirstPersonHUD(void) /* // [21:42] <+Rob> Beige - Lavender - Steel Blue - Peach - Orange - Purple - Silver - Yellow - Pink - Red - Blue - Green - Cyan - Gold static skincolors_t linkColor[14] = -{SKINCOLOR_BEIGE, SKINCOLOR_LAVENDER, SKINCOLOR_STEELBLUE, SKINCOLOR_PEACH, SKINCOLOR_ORANGE, +{SKINCOLOR_BEIGE, SKINCOLOR_LAVENDER, SKINCOLOR_STEEL, SKINCOLOR_PEACH, SKINCOLOR_ORANGE, SKINCOLOR_PURPLE, SKINCOLOR_SILVER, SKINCOLOR_SUPER4, SKINCOLOR_PINK, SKINCOLOR_RED, SKINCOLOR_BLUE, SKINCOLOR_GREEN, SKINCOLOR_CYAN, SKINCOLOR_GOLD}; @@ -980,7 +980,7 @@ static void ST_drawNightsRecords(void) V_DrawString(BASEVIDWIDTH/2 - 48, STRINGY(148), aflag, "BONUS:"); V_DrawRightAlignedString(BASEVIDWIDTH/2 + 48, STRINGY(140), V_ORANGEMAP|aflag, va("%d", stplyr->finishedrings)); V_DrawRightAlignedString(BASEVIDWIDTH/2 + 48, STRINGY(148), V_ORANGEMAP|aflag, va("%d", stplyr->finishedrings * 50)); - ST_DrawNightsOverlayNum(BASEVIDWIDTH/2 + 48, STRINGY(160), aflag, stplyr->lastmarescore, nightsnum, SKINCOLOR_STEELBLUE); + ST_DrawNightsOverlayNum(BASEVIDWIDTH/2 + 48, STRINGY(160), aflag, stplyr->lastmarescore, nightsnum, SKINCOLOR_STEEL); // If new record, say so! if (!(netgame || multiplayer) && G_GetBestNightsScore(gamemap, stplyr->lastmare + 1) <= stplyr->lastmarescore) @@ -1264,7 +1264,7 @@ static void ST_drawNiGHTSHUD(void) // SRB2kart - unused. #endif ) { - ST_DrawNightsOverlayNum(304, STRINGY(16), SPLITFLAGS(V_SNAPTOTOP)|V_SNAPTORIGHT, stplyr->marescore, nightsnum, SKINCOLOR_STEELBLUE); + ST_DrawNightsOverlayNum(304, STRINGY(16), SPLITFLAGS(V_SNAPTOTOP)|V_SNAPTORIGHT, stplyr->marescore, nightsnum, SKINCOLOR_STEEL); } if (!stplyr->exiting diff --git a/src/v_video.c b/src/v_video.c index efb10d17..56edb0db 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -1129,7 +1129,7 @@ const UINT8 *V_GetStringColormap(INT32 colorflags) case 2: // 0x82, yellow return yellowmap; case 3: // 0x83, lgreen - return lgreenmap; + return greenmap; case 4: // 0x84, blue return bluemap; case 5: // 0x85, red diff --git a/src/y_inter.c b/src/y_inter.c index 1695f45d..0bae4cb1 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -36,9 +36,10 @@ #include "m_cond.h" // condition sets -#include "m_random.h" // P_RandomKey +#include "m_random.h" // M_RandomKey #include "g_input.h" // PLAYER1INPUTDOWN #include "k_kart.h" // colortranslations +#include "console.h" // cons_menuhighlight #ifdef HWRENDER #include "hardware/hw_main.h" @@ -309,6 +310,7 @@ void Y_IntermissionDrawer(void) INT32 x = 4; INT32 y = 48; char name[MAXPLAYERNAME+1]; + INT32 hilicol = (cons_menuhighlight.value) ? cons_menuhighlight.value : V_SKYMAP; boolean completed[MAXPLAYERS]; memset(completed, 0, sizeof (completed)); @@ -321,32 +323,26 @@ void Y_IntermissionDrawer(void) { V_DrawFill(160, 32, 1, 152, 0); - V_DrawCenteredString(x+6+(BASEVIDWIDTH/2), 32, V_SKYMAP, "#"); - V_DrawString(x+36+(BASEVIDWIDTH/2), 32, V_SKYMAP, "NAME"); + V_DrawCenteredString(x+6+(BASEVIDWIDTH/2), 32, hilicol, "#"); + V_DrawString(x+36+(BASEVIDWIDTH/2), 32, hilicol, "NAME"); - V_DrawRightAlignedString(x+110, 32, V_SKYMAP, "TIME"); + V_DrawRightAlignedString(x+110, 32, hilicol, "TIME"); - V_DrawRightAlignedString(x+152, 32, V_SKYMAP, "SCORE"); + V_DrawRightAlignedString(x+152, 32, hilicol, "SCORE"); } - V_DrawCenteredString(x+6, 32, V_SKYMAP, "#"); - V_DrawString(x+36, 32, V_SKYMAP, "NAME"); + V_DrawCenteredString(x+6, 32, hilicol, "#"); + V_DrawString(x+36, 32, hilicol, "NAME"); if (data.match.numplayers > 8) - { - V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+110, 32, V_SKYMAP, "TIME"); - } + V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+110, 32, hilicol, "TIME"); else - { - V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+62, 32, V_SKYMAP, "TIME"); - } + V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+62, 32, hilicol, "TIME"); - V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+152, 32, V_SKYMAP, "SCORE"); + V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+152, 32, hilicol, "SCORE"); for (i = 0; i < data.match.numplayers; i++) { - char strtime[10]; - if (data.match.spectator[i]) continue; @@ -355,6 +351,8 @@ void Y_IntermissionDrawer(void) if (playeringame[data.match.num[i]]) { + char strtime[10]; + if (data.match.color[i] == 0) V_DrawSmallScaledPatch(x+16, y-4, 0,faceprefix[*data.match.character[i]]); else @@ -364,9 +362,7 @@ void Y_IntermissionDrawer(void) } if (data.match.numplayers > 8) - { strlcpy(name, data.match.name[i], 6); - } else STRBUFCPY(name, data.match.name[i]); @@ -375,13 +371,9 @@ void Y_IntermissionDrawer(void) snprintf(strtime, sizeof strtime, "%d", data.match.scores[i]-data.match.increase[i]); if (data.match.numplayers > 8) - { - V_DrawRightAlignedString(x+152, y, V_SKYMAP, strtime); - } + V_DrawRightAlignedString(x+152, y, hilicol, strtime); else - { - V_DrawRightAlignedString(x+152+BASEVIDWIDTH/2, y, V_SKYMAP, strtime); - } + V_DrawRightAlignedString(x+152+BASEVIDWIDTH/2, y, hilicol, strtime); if (data.match.increase[i] > 9) snprintf(strtime, sizeof strtime, "(+%02d)", data.match.increase[i]); @@ -389,9 +381,7 @@ void Y_IntermissionDrawer(void) snprintf(strtime, sizeof strtime, "(+ %d)", data.match.increase[i]); if (data.match.numplayers <= 8) // Only draw this with less than 8 players, otherwise we won't be able to fit the times in - { V_DrawString(x+84+BASEVIDWIDTH/2, y, 0, strtime); - } snprintf(strtime, sizeof strtime, "%i:%02i.%02i", G_TicsToMinutes(data.match.time[i], true), G_TicsToSeconds(data.match.time[i]), G_TicsToCentiseconds(data.match.time[i])); @@ -399,13 +389,9 @@ void Y_IntermissionDrawer(void) strtime[sizeof strtime - 1] = '\0'; if (data.match.numplayers > 8) - { V_DrawRightAlignedString(x+134, y, 0, strtime); - } else - { V_DrawRightAlignedString(x+80+BASEVIDWIDTH/2, y, 0, strtime); - } completed[i] = true; @@ -426,7 +412,7 @@ void Y_IntermissionDrawer(void) INT32 x = 4; INT32 y = 48; char name[MAXPLAYERNAME+1]; - char strtime[10]; + INT32 hilicol = (cons_menuhighlight.value) ? cons_menuhighlight.value : V_REDMAP; // draw the header V_DrawScaledPatch((BASEVIDWIDTH/2) - (SHORT(data.match.result->width) / 2), 2, 0, data.match.result); @@ -439,16 +425,16 @@ void Y_IntermissionDrawer(void) { V_DrawFill(160, 32, 1, 152, 0); - V_DrawRightAlignedString(x+152, 32, V_REDMAP, "SCORE"); + V_DrawRightAlignedString(x+152, 32, hilicol, "SCORE"); - V_DrawCenteredString(x+(BASEVIDWIDTH/2)+6, 32, V_REDMAP, "#"); - V_DrawString(x+(BASEVIDWIDTH/2)+36, 32, V_REDMAP, "NAME"); + V_DrawCenteredString(x+(BASEVIDWIDTH/2)+6, 32, hilicol, "#"); + V_DrawString(x+(BASEVIDWIDTH/2)+36, 32, hilicol, "NAME"); } - V_DrawCenteredString(x+6, 32, V_REDMAP, "#"); - V_DrawString(x+36, 32, V_REDMAP, "NAME"); + V_DrawCenteredString(x+6, 32, hilicol, "#"); + V_DrawString(x+36, 32, hilicol, "NAME"); - V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+152, 32, V_REDMAP, "SCORE"); + V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+152, 32, hilicol, "SCORE"); for (i = 0; i < data.match.numplayers; i++) { @@ -472,35 +458,14 @@ void Y_IntermissionDrawer(void) } if (data.match.numplayers > 9) - { - if (intertype == int_race) - strlcpy(name, data.match.name[i], 8); - else - strlcpy(name, data.match.name[i], 9); - } + strlcpy(name, data.match.name[i], 9); else STRBUFCPY(name, data.match.name[i]); V_DrawString(x+36, y, V_ALLOWLOWERCASE, name); if (data.match.numplayers > 9) - { - if (intertype == int_match) - V_DrawRightAlignedString(x+152, y, 0, va("%i", data.match.scores[i])); - else if (intertype == int_race) - { - if (players[data.match.num[i]].pflags & PF_TIMEOVER) - snprintf(strtime, sizeof strtime, "DNF"); - else - snprintf(strtime, sizeof strtime, - "%i:%02i.%02i", - G_TicsToMinutes(data.match.scores[i], true), - G_TicsToSeconds(data.match.scores[i]), G_TicsToCentiseconds(data.match.scores[i])); - - strtime[sizeof strtime - 1] = '\0'; - V_DrawRightAlignedString(x+152, y, 0, strtime); - } - } + V_DrawRightAlignedString(x+152, y, 0, va("%i", data.match.scores[i])); else V_DrawRightAlignedString(x+152+BASEVIDWIDTH/2, y, 0, va("%u", data.match.scores[i])); } @@ -2192,11 +2157,11 @@ void Y_VoteDrawer(void) if (voteclient.playerinfo[j].selection != i) continue; - if (splitscreen == 0) + if (!splitscreen) { thiscurs = cursor; p = consoleplayer; - color = 104; + color = levelinfo[i].gtc; colormap = NULL; } else @@ -2231,7 +2196,7 @@ void Y_VoteDrawer(void) handy += 6*(3-splitscreen) + (13*j); V_DrawMappedPatch(BASEVIDWIDTH-124, handy, V_SNAPTORIGHT, thiscurs, colormap); - if (votetic % 5 == 0) + if (votetic % 10 < 4) V_DrawFill(BASEVIDWIDTH-100-sizeadd, y-sizeadd, 80+(sizeadd*2), 50+(sizeadd*2), 120|V_SNAPTORIGHT); else V_DrawFill(BASEVIDWIDTH-100-sizeadd, y-sizeadd, 80+(sizeadd*2), 50+(sizeadd*2), color|V_SNAPTORIGHT); @@ -2287,10 +2252,10 @@ void Y_VoteDrawer(void) if (!timer && i == voteclient.ranim) { V_DrawScaledPatch(x-18, y+9, V_SNAPTOLEFT, cursor); - if (votetic % 4 > 1) + if (!(votetic % 4)) V_DrawFill(x-1, y-1, 42, 27, 120|V_SNAPTOLEFT); else - V_DrawFill(x-1, y-1, 42, 27, 103|V_SNAPTOLEFT); + V_DrawFill(x-1, y-1, 42, 27, levelinfo[votes[i]].gtc|V_SNAPTOLEFT); } V_DrawTinyScaledPatch(x, y, V_SNAPTOLEFT, pic); @@ -2599,13 +2564,11 @@ void Y_StartVote(void) levelinfo[i].str[sizeof levelinfo[i].str - 1] = '\0'; // set up the gtc and gts + levelinfo[i].gtc = G_GetGametypeColor(votelevels[i][1]); if (i == 2 && votelevels[i][1] != votelevels[0][1]) - { - levelinfo[i].gtc = G_GetGametypeColor(votelevels[i][1]); levelinfo[i].gts = gametype_cons_t[votelevels[i][1]].strvalue; - } else - levelinfo[i].gts = NULL; // gtc is never accessed in this case + levelinfo[i].gts = NULL; // set up the pic lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(votelevels[i][0]+1)));