stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-21 18:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'radiomode2' into 'master'

Browse source 
Radio Mode fixes

See merge request STJr/SRB2Internal!459
This commit is contained in:
MascaraSnake 2019-11-13 13:58:26 -05:00
commit 1d7ce8d955
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/m_menu.c
View file

@ -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);

2
src/s_sound.c
View file

@ -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,