From a256e170ab8fb1f10d04e12fa50647bbb18af7c5 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 27 Nov 2023 15:37:22 +0100 Subject: [PATCH] fix interpolation speeding things up + make box wider --- src/m_menu.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index b9b4f597f..f4bb9dd13 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -8145,11 +8145,11 @@ static void M_DrawMusicTest(void) //angle_t ang; //bpm = FixedDiv((60*TICRATE)<= (FRACUNIT>>1)) // prevent overflow jump - takes about 15 minutes of loop on the same song to reach - st_time = (work>>FRACBITS); + if (st_time >= (FRACUNIT << (FRACBITS - 2))) // prevent overflow jump - takes about 15 minutes of loop on the same song to reach + st_time = work; //work = FixedDiv(work*180, bpm); //frame[0] = 8-(work/(20<= i) - st_scroll %= i; + st_scroll += renderdeltatics; - x -= st_scroll; + while (st_scroll >= (i << FRACBITS)) + st_scroll -= i << FRACBITS; + + x -= st_scroll >> FRACBITS; while (x < BASEVIDWIDTH-y) x += i; @@ -8227,7 +8229,7 @@ static void M_DrawMusicTest(void) //V_DrawRightAlignedString(BASEVIDWIDTH-16, 46, V_ALLOWLOWERCASE, curplaying->source); } - V_DrawFill(40, 60, 240, 112, 159); + V_DrawFill(20, 60, 280, 112, 159); { INT32 t, b, q, m = 112; @@ -8262,15 +8264,15 @@ static void M_DrawMusicTest(void) } } - V_DrawFill(40+240-1, 60 + i, 1, m, 0); + V_DrawFill(20+280-1, 60 + i, 1, m, 0); if (t != 0) - V_DrawString(40+240+4, 60+4 - (skullAnimCounter/5), V_YELLOWMAP, "\x1A"); + V_DrawString(20+280+4, 60+4 - (skullAnimCounter/5), V_YELLOWMAP, "\x1A"); if (b != numsoundtestdefs - 1) - V_DrawString(40+240+4, 60+112-12 + (skullAnimCounter/5), V_YELLOWMAP, "\x1B"); + V_DrawString(20+280+4, 60+112-12 + (skullAnimCounter/5), V_YELLOWMAP, "\x1B"); - x = 49; + x = 24; y = 64; if (renderisnewtic) ++st_namescroll; @@ -8278,10 +8280,10 @@ static void M_DrawMusicTest(void) while (t <= b) { if (t == st_sel) - V_DrawFill(40, y-4, 240-1, 16, 155); + V_DrawFill(20, y-4, 280-1, 16, 155); { - const size_t MAXLENGTH = 28; + const size_t MAXLENGTH = 34; const tic_t SCROLLSPEED = TICRATE/5; // Number of tics for name being scrolled by 1 letter size_t nameoffset = 0; size_t namelength = strlen(soundtestdefs[t]->source); @@ -8352,7 +8354,7 @@ static void M_DrawMusicTest(void) V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf); if (curplaying == soundtestdefs[t]) { - V_DrawFill(40+240-9, y-4, 8, 16, 150); + V_DrawFill(20+280-9, y-4, 8, 16, 150); //V_DrawCharacter(165+140-8, y, '\x19' | V_YELLOWMAP, false); //V_DrawFixedPatch((165+140-9)<