Merge branch 'radiomode2' into 'master'
Radio Mode fixes See merge request STJr/SRB2Internal!459
This commit is contained in:
commit
1d7ce8d955
|
@ -7109,6 +7109,8 @@ static void M_DrawSoundTest(void)
|
||||||
|
|
||||||
work = FixedDiv(work*180, bpm);
|
work = FixedDiv(work*180, bpm);
|
||||||
frame[0] = 8-(work/(20<<FRACBITS));
|
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;
|
ang = (FixedAngle(work)>>ANGLETOFINESHIFT) & FINEMASK;
|
||||||
bounce = (FINESINE(ang) - FRACUNIT/2);
|
bounce = (FINESINE(ang) - FRACUNIT/2);
|
||||||
hscale -= bounce/16;
|
hscale -= bounce/16;
|
||||||
|
@ -7184,7 +7186,7 @@ static void M_DrawSoundTest(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (curplaying)
|
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);
|
V_DrawFill(165, 60, 140, 112, 159);
|
||||||
|
|
|
@ -1434,7 +1434,7 @@ musicdef_t soundtestsfx = {
|
||||||
"_STSFX", // prevents exactly one valid track name from being used on the sound test
|
"_STSFX", // prevents exactly one valid track name from being used on the sound test
|
||||||
"Sound Effects",
|
"Sound Effects",
|
||||||
"",
|
"",
|
||||||
"SEGA, Sonic Team Jr, other sources",
|
"SEGA, VAdaPEGA, other sources",
|
||||||
1, // show on soundtest page 1
|
1, // show on soundtest page 1
|
||||||
0, // with no conditions
|
0, // with no conditions
|
||||||
0,
|
0,
|
||||||
|
|
Loading…
Reference in New Issue