diff --git a/src/deh_tables.c b/src/deh_tables.c index 7c96b5571..10a58d6eb 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -6110,6 +6110,8 @@ const char *COLOR_ENUMS[] = { "POSNUM_BEST4", "POSNUM_BEST5", "POSNUM_BEST6", + + "INTERMISSION", }; const char *const KARTHUD_LIST[] = { diff --git a/src/doomdef.h b/src/doomdef.h index 890ace89a..0e09a6aa6 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -425,6 +425,8 @@ typedef enum SKINCOLOR_POSNUM_BEST4, SKINCOLOR_POSNUM_BEST5, SKINCOLOR_POSNUM_BEST6, + + SKINCOLOR_INTERMISSION, SKINCOLOR_FIRSTFREESLOT, SKINCOLOR_LASTFREESLOT = SKINCOLOR_FIRSTFREESLOT + NUMCOLORFREESLOTS - 1, diff --git a/src/info.c b/src/info.c index 572792499..3bfe157e3 100644 --- a/src/info.c +++ b/src/info.c @@ -29732,7 +29732,9 @@ skincolor_t skincolors[MAXSKINCOLORS] = { {"Position Best 3", {112, 112, 113, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119, 110, 111, 30}, SKINCOLOR_NONE, 0, 0, false}, // SKINCOLOR_POSNUM_BEST3 {"Position Best 4", {255, 255, 122, 122, 123, 123, 141, 141, 142, 142, 143, 143, 138, 139, 254, 30}, SKINCOLOR_NONE, 0, 0, false}, // SKINCOLOR_POSNUM_BEST4 {"Position Best 5", {152, 152, 153, 153, 154, 154, 155, 155, 156, 156, 157, 158, 159, 253, 254, 30}, SKINCOLOR_NONE, 0, 0, false}, // SKINCOLOR_POSNUM_BEST5 - {"Position Best 6", {181, 181, 182, 182, 183, 183, 184, 184, 185, 185, 186, 186, 187, 187, 29, 30}, SKINCOLOR_NONE, 0, 0, false} // SKINCOLOR_POSNUM_BEST6 + {"Position Best 6", {181, 181, 182, 182, 183, 183, 184, 184, 185, 185, 186, 186, 187, 187, 29, 30}, SKINCOLOR_NONE, 0, 0, false}, // SKINCOLOR_POSNUM_BEST6 + + {"Intermission", {0,80,80,81,81,81,84,85,86,87,246,248,251,26,28,31}, SKINCOLOR_NONE, 0, 0, false} // SKINCOLOR_INTERMISSION }; /** Patches the mobjinfo, state, and skincolor tables. diff --git a/src/y_inter.c b/src/y_inter.c index 27fac5516..c78709902 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -628,10 +628,13 @@ skiptallydrawer: // Scrolling marquee patch_t *rrmq = W_CachePatchName("R_RRMQ", PU_PATCH); + // fuck me dude holy shit + patch_t *white = W_CachePatchName("R_WHIT", PU_PATCH); + UINT8 *color = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_YELLOW, GTC_CACHE); // I don't even know how necessary this is anymore but I don't want the game yelling at me UINT8 *greymap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_GREY, GTC_CACHE); - K_RainbowColormap(color, SKINCOLOR_YELLOW); + K_RainbowColormap(color, SKINCOLOR_INTERMISSION); if (intertype == int_none || rendermode == render_none) return; @@ -649,6 +652,10 @@ skiptallydrawer: // Draw the background K_DrawMapThumbnail(0, 0, BASEVIDWIDTH<