From 3070c2037baed139bebcfcd75a41aba6c97c5034 Mon Sep 17 00:00:00 2001 From: wolfy852 Date: Mon, 20 Feb 2023 23:32:05 -0600 Subject: [PATCH] New intermission base Very incomplete. Currently draws the background and most of the necessary patches. Ignore some of the stupid shit I did here, it'll be cleaned up later. --- src/y_inter.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 2 deletions(-) diff --git a/src/y_inter.c b/src/y_inter.c index b08d98e93..c414a776c 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -47,6 +47,7 @@ #include "k_boss.h" #include "k_pwrlv.h" #include "k_grandprix.h" +#include "k_color.h" #ifdef HWRENDER #include "hardware/hw_main.h" @@ -291,7 +292,7 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32)) void Y_IntermissionDrawer(void) { -// dummy ALL OF THIS SHIT out, we're gonnas be starting over. +// dummy ALL OF THIS SHIT out, we're gonna be starting over. #if 0 INT32 i, whiteplayer = MAXPLAYERS, x = 4, hilicol = highlightflags; @@ -588,12 +589,106 @@ skiptallydrawer: M_DrawMenuForeground(); #endif - UINT8 *color = NULL; + + // Patches + patch_t *gthro = W_CachePatchName("R_GTHRO", PU_PATCH); + patch_t *resbar = W_CachePatchName("R_RESBAR", PU_PATCH); + patch_t *rmbg1 = W_CachePatchName("R_RMBG1", PU_PATCH); + patch_t *rmbg2 = W_CachePatchName("R_RMBG2", PU_PATCH); + patch_t *rmbg3 = W_CachePatchName("R_RMBG3", PU_PATCH); + patch_t *rmbg4 = W_CachePatchName("R_RMBG4", PU_PATCH); + patch_t *rpmark = W_CachePatchName("R_RPMARK", PU_PATCH); + patch_t *rrmrk1 = W_CachePatchName("R_RRMRK1", PU_PATCH); + patch_t *rrmrk2 = W_CachePatchName("R_RRMRK2", PU_PATCH); + patch_t *rrmrk3 = W_CachePatchName("R_RRMRK3", PU_PATCH); + patch_t *rrmrk4 = W_CachePatchName("R_RRMRK4", PU_PATCH); + patch_t *rrmln1 = W_CachePatchName("R_RRMLN1", PU_PATCH); + patch_t *rrmln2 = W_CachePatchName("R_RRMLN2", PU_PATCH); + patch_t *rrmls1 = W_CachePatchName("R_RRMLS1", PU_PATCH); + patch_t *rrmls2 = W_CachePatchName("R_RRMLS2", PU_PATCH); + patch_t *rtpbr = W_CachePatchName("R_RTPBR", 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); if (intertype == int_none || rendermode == render_none) return; + if (renderisnewtic) + { + LUA_HUD_ClearDrawList(luahuddrawlist_intermission); + LUA_HookHUD(luahuddrawlist_intermission, HUD_HOOK(intermission)); + } + LUA_HUD_DrawList(luahuddrawlist_intermission); + + //if (!LUA_HudEnabled(hud_intermissiontally)) + //goto skiptallydrawer; + + // Draw the background K_DrawMapThumbnail(0, 0, BASEVIDWIDTH<