From 7b640bc81e0f4d50f70d85bd5f94d232ca53c09e Mon Sep 17 00:00:00 2001 From: toaster <rollerorbital@gmail.com> Date: Wed, 13 Nov 2019 13:43:42 +0000 Subject: [PATCH 1/2] * Prevent (extremely unlikely) wraparound of patch frame calculation for the epynomous Radio (sigsegv prevention). * Use thinstring for Authors field on the screen. --- src/m_menu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/m_menu.c b/src/m_menu.c index 6c066fe30..4e9f1ed84 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -7109,6 +7109,8 @@ static void M_DrawSoundTest(void) work = FixedDiv(work*180, bpm); frame[0] = 8-(work/(20<<FRACBITS)); + if (frame[0] > 8) // VERY small likelihood for the above calculation to wrap, but it turns out it IS possible lmao + frame[0] = 0; ang = (FixedAngle(work)>>ANGLETOFINESHIFT) & FINEMASK; bounce = (FINESINE(ang) - FRACUNIT/2); hscale -= bounce/16; @@ -7184,7 +7186,7 @@ static void M_DrawSoundTest(void) } if (curplaying) - V_DrawRightAlignedString(BASEVIDWIDTH-16, 46, V_ALLOWLOWERCASE, curplaying->authors); + V_DrawRightAlignedThinString(BASEVIDWIDTH-16, 46, V_ALLOWLOWERCASE, curplaying->authors); } V_DrawFill(165, 60, 140, 112, 159); From a7f2931b47e854cfe59e5be04fd665a9c987e16b Mon Sep 17 00:00:00 2001 From: toaster <rollerorbital@gmail.com> Date: Wed, 13 Nov 2019 15:02:06 +0000 Subject: [PATCH 2/2] Update SFX definition to credit VAdaPEGA specifically, given we've made most credits more specific now too. --- src/s_sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s_sound.c b/src/s_sound.c index ab4bde617..615ae9567 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1434,7 +1434,7 @@ musicdef_t soundtestsfx = { "_STSFX", // prevents exactly one valid track name from being used on the sound test "Sound Effects", "", - "SEGA, Sonic Team Jr, other sources", + "SEGA, VAdaPEGA, other sources", 1, // show on soundtest page 1 0, // with no conditions 0,