From a333b265b44a19332f604fcfd2bc0896a950a084 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 8 May 2023 13:04:25 +0100 Subject: [PATCH] Clean up material that is no longer necessary to keep around --- src/y_inter.c | 272 -------------------------------------------------- 1 file changed, 272 deletions(-) diff --git a/src/y_inter.c b/src/y_inter.c index 2b47d61b5..dede6ca84 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -99,7 +99,6 @@ static INT32 endtic = -1; static INT32 sorttic = -1; static INT32 replayprompttic; -// FUCK YOU static fixed_t mqscroll = 0; static fixed_t chkscroll = 0; @@ -322,277 +321,6 @@ typedef enum // void Y_IntermissionDrawer(void) { - -// dummy ALL OF THIS SHIT out, we're gonna be starting over. -#if 0 - INT32 i, whiteplayer = MAXPLAYERS, x = 4, hilicol = highlightflags; - - // If we early return, skip drawing the 3D scene (software buffer) so it doesn't clobber the frame for the wipe - g_wipeskiprender = true; - - if (intertype == int_none || rendermode == render_none) - return; - - g_wipeskiprender = false; - - // the merge was kind of a mess, how does this work -- toast 171021 - { - M_DrawMenuBackground(); - } - - 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; - - if (!r_splitscreen) - whiteplayer = demo.playback ? displayplayers[0] : consoleplayer; - - if (sorttic != -1 && intertic > sorttic) - { - INT32 count = (intertic - sorttic); - - if (count < 8) - x -= ((count * vid.width) / (8 * vid.dupx)); - else if (count == 8) - goto skiptallydrawer; - else if (count < 16) - x += (((16 - count) * vid.width) / (8 * vid.dupx)); - } - - if (intertype == int_time || intertype == int_score) - { -#define NUMFORNEWCOLUMN 8 - INT32 y = 41, gutter = ((data.numplayers > NUMFORNEWCOLUMN) ? 0 : (BASEVIDWIDTH/2)); - INT32 dupadjust = (vid.width/vid.dupx), duptweak = (dupadjust - BASEVIDWIDTH)/2; - const char *timeheader; - int y2; - - if (data.rankingsmode) - { - if (powertype == PWRLV_DISABLED) - { - timeheader = "RANK"; - } - else - { - timeheader = "PWR.LV"; - } - } - else - { - switch (intertype) - { - case int_score: - timeheader = "SCORE"; - break; - default: - timeheader = "TIME"; - break; - } - } - - // draw the level name - V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 12, 0, data.levelstring); - V_DrawFill((x-3) - duptweak, 34, dupadjust-2, 1, 0); - - if (data.encore) - V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 12-8, hilicol, "ENCORE MODE"); - - if (data.numplayers > NUMFORNEWCOLUMN) - { - V_DrawFill(x+156, 24, 1, 158, 0); - V_DrawFill((x-3) - duptweak, 182, dupadjust-2, 1, 0); - - V_DrawCenteredString(x+6+(BASEVIDWIDTH/2), 24, hilicol, "#"); - V_DrawString(x+36+(BASEVIDWIDTH/2), 24, hilicol, "NAME"); - - V_DrawRightAlignedString(x+152, 24, hilicol, timeheader); - } - - V_DrawCenteredString(x+6, 24, hilicol, "#"); - V_DrawString(x+36, 24, hilicol, "NAME"); - - V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+152, 24, hilicol, timeheader); - - for (i = 0; i < data.numplayers; i++) - { - boolean dojitter = data.jitter[data.num[i]]; - data.jitter[data.num[i]] = 0; - - if (data.num[i] != MAXPLAYERS && playeringame[data.num[i]] && !players[data.num[i]].spectator) - { - char strtime[MAXPLAYERNAME+1]; - - if (dojitter) - y--; - - V_DrawCenteredString(x+6, y, 0, va("%d", data.pos[i])); - - if (data.color[i]) - { - UINT8 *colormap = R_GetTranslationColormap(*data.character[i], *data.color[i], GTC_CACHE); - V_DrawMappedPatch(x+16, y-4, 0, faceprefix[*data.character[i]][FACE_RANK], colormap); - } - - if (data.num[i] == whiteplayer) - { - UINT8 cursorframe = (intertic / 4) % 8; - V_DrawScaledPatch(x+16, y-4, 0, W_CachePatchName(va("K_CHILI%d", cursorframe+1), PU_CACHE)); - } - - if ((players[data.num[i]].pflags & PF_NOCONTEST) && players[data.num[i]].bot) - { - // RETIRED!! - V_DrawScaledPatch(x+12, y-7, 0, W_CachePatchName("K_NOBLNS", PU_CACHE)); - } - - STRBUFCPY(strtime, data.name[i]); - - y2 = y; - - if ((netgame || (demo.playback && demo.netgame)) && playerconsole[data.num[i]] == 0 && server_lagless && !players[data.num[i]].bot) - { - static int alagles_timer = 0; - patch_t *alagles; - - y2 = ( y - 4 ); - - V_DrawScaledPatch(x + 36, y2, 0, W_CachePatchName(va("BLAGLES%d", (intertic / 3) % 6), PU_CACHE)); - // every 70 tics - if (( leveltime % 70 ) == 0) - { - alagles_timer = 9; - } - if (alagles_timer > 0) - { - alagles = W_CachePatchName(va("ALAGLES%d", alagles_timer), PU_CACHE); - V_DrawScaledPatch(x + 36, y2, 0, alagles); - if (( leveltime % 2 ) == 0) - alagles_timer--; - } - else - { - alagles = W_CachePatchName("ALAGLES0", PU_CACHE); - V_DrawScaledPatch(x + 36, y2, 0, alagles); - } - - y2 += SHORT (alagles->height) + 1; - } - - if (data.numplayers > NUMFORNEWCOLUMN) - V_DrawThinString(x+36, y2-1, ((data.num[i] == whiteplayer) ? hilicol : 0)|V_ALLOWLOWERCASE|V_6WIDTHSPACE, strtime); - else - V_DrawString(x+36, y2, ((data.num[i] == whiteplayer) ? hilicol : 0)|V_ALLOWLOWERCASE, strtime); - - if (data.rankingsmode) - { - if (powertype != PWRLV_DISABLED && !clientpowerlevels[data.num[i]][powertype]) - { - // No power level (guests) - STRBUFCPY(strtime, "----"); - } - else - { - if (data.increase[data.num[i]] != INT16_MIN) - { - snprintf(strtime, sizeof strtime, "(%d)", data.increase[data.num[i]]); - - if (data.numplayers > NUMFORNEWCOLUMN) - V_DrawRightAlignedThinString(x+133+gutter, y-1, V_6WIDTHSPACE, strtime); - else - V_DrawRightAlignedString(x+118+gutter, y, 0, strtime); - } - - snprintf(strtime, sizeof strtime, "%d", data.val[i]); - } - - if (data.numplayers > NUMFORNEWCOLUMN) - V_DrawRightAlignedThinString(x+152+gutter, y-1, V_6WIDTHSPACE, strtime); - else - V_DrawRightAlignedString(x+152+gutter, y, 0, strtime); - } - else - { - if (data.val[i] == (UINT32_MAX-1)) - V_DrawRightAlignedThinString(x+152+gutter, y-1, (data.numplayers > NUMFORNEWCOLUMN ? V_6WIDTHSPACE : 0), "NO CONTEST."); - else - { - if (intertype == int_time) - { - snprintf(strtime, sizeof strtime, "%i'%02i\"%02i", G_TicsToMinutes(data.val[i], true), - G_TicsToSeconds(data.val[i]), G_TicsToCentiseconds(data.val[i])); - strtime[sizeof strtime - 1] = '\0'; - - if (data.numplayers > NUMFORNEWCOLUMN) - V_DrawRightAlignedThinString(x+152+gutter, y-1, V_6WIDTHSPACE, strtime); - else - V_DrawRightAlignedString(x+152+gutter, y, 0, strtime); - } - else - { - if (data.numplayers > NUMFORNEWCOLUMN) - V_DrawRightAlignedThinString(x+152+gutter, y-1, V_6WIDTHSPACE, va("%i", data.val[i])); - else - V_DrawRightAlignedString(x+152+gutter, y, 0, va("%i", data.val[i])); - } - } - } - - if (dojitter) - y++; - } - else - data.num[i] = MAXPLAYERS; // this should be the only field setting in this function - - y += 18; - - if (i == NUMFORNEWCOLUMN-1) - { - y = 41; - x += BASEVIDWIDTH/2; - } -#undef NUMFORNEWCOLUMN - } - } - -skiptallydrawer: - if (!LUA_HudEnabled(hud_intermissionmessages)) - return; - - if (timer) - { - if (netgame || demo.netgame) - { - char *string; - INT32 tickdown = (timer+1)/TICRATE; - - if (demo.playback) - string = va("Replay ends in %d", tickdown); - else if ((nextmapoverride != 0) - || (roundqueue.size > 0 && roundqueue.position < roundqueue.size)) - string = va("Next starts in %d", tickdown); - else - string = va("%s starts in %d", cv_advancemap.string, tickdown); - - V_DrawCenteredString(BASEVIDWIDTH/2, 188, hilicol, string); - - if (speedscramble != -1 && speedscramble != gamespeed) - { - V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, hilicol|V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, - va(M_GetText("Next race will be %s Speed!"), kartspeed_cons_t[1+speedscramble].strvalue)); - } - } - } - - M_DrawMenuForeground(); -#endif - // INFO SEGMENT // Numbers are V_DrawRightAlignedThinString WITH v_6widthspace as flags // resbar 1 (48,82) 5 (176, 82)